Merge master into cmake