Merge branch 'develop' into coverity-scan
After cleaning some coverity-unrelated files.