Commit 77394a27af283b366fa8bb444d29670131bfa104

Carlos Martín Nieto 2016-03-14T19:15:20

Merge pull request #3677 from pks-t/pks/coverity-fixes-round7 Coverity fixes round 7