Commit 90500d81dcb04ae3bdaf0f6211ca8754d9425b70

Edward Thomson 2017-06-08T13:56:22

Merge pull request #4253 from pks-t/pks/cov-fixes Coverity fixes