Commit 4848dd326a98c5973b82f5a362a52362855a4fc5

Carlos Martín Nieto 2016-03-14T17:45:15

Merge pull request #3647 from pks-t/pks/coverity-fixes-round6 Coverity fixes round 6