Merge pull request #537 from mayeut/master
authorMatthieu Darbois <mayeut@users.noreply.github.com>
Sat, 18 Jul 2015 19:46:59 +0000 (21:46 +0200)
committerMatthieu Darbois <mayeut@users.noreply.github.com>
Sat, 18 Jul 2015 19:46:59 +0000 (21:46 +0200)
Various Minor fixes


Trivial merge