Merge master into coverity_scan