Merge master into coverity scan branch