Commit ff80b5e80b814af835b68e3d881d79d3a25504b0

Edward Thomson 2015-01-26T11:24:47

Merge pull request #2847 from jacquesg/coverity More coverity fixes