Test Coverity
Merge branch 'master' into coverity_scan