Merge master into 1.10