Merge master into branch 2.1