Merge remote-tracking branch 'mvo/bugfix/coverity' into debian/sid