Merge branch 'coverity' into 'master'