Merge master into 2.0