Commit 0d9a7498c5f8852a60ffaf4d1c6b53c919193694

Edward Thomson 2016-02-25T12:09:49

Merge pull request #3628 from pks-t/pks/coverity-fixes Coverity fixes