Commit 3983935b0f7d5ece65bb8c6532af2f7ed27a197a

Edward Thomson 2015-02-04T16:11:15

Merge pull request #2872 from ethomson/pedantic Fixes for pedantry