Merge master into 1.1