Joseph Heenan

Merge pull request #388 from jweyrich/master

Enable a couple of warnings (related to #342)
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.