Merge pull request #1834 from bmiklautz/fix/misc
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Thu, 8 May 2014 19:59:17 +0000 (15:59 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Thu, 8 May 2014 19:59:17 +0000 (15:59 -0400)
Misc small fixes


Trivial merge