Merge upstream master into 2.11