Merge master into 1.6.2