Merge pull request #4 from remicollet/312

Version 3.1.2 build warnings
Merge remote-tracking branch 'upstream/master' into 312