Commit 19bca3d33c863dc95ed322b9f8c990808d9af80f

Edward Thomson 2019-01-08T14:35:39

Merge pull request #4922 from tiennou/fix/coverity-cids Coverity fixes