Merge pull request #2262 from bmiklautz/misc_fixes
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Thu, 11 Dec 2014 13:27:30 +0000 (08:27 -0500)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Thu, 11 Dec 2014 13:27:30 +0000 (08:27 -0500)
Misc fixes


Trivial merge