Commit c4f60543b7ccfce852ebdc8c12b62c99a5d4c2a5

Edward Thomson 2015-11-20T17:57:04

Merge pull request #3517 from jacquesg/warnings-fixes Fix some warnings