merge master into 2.0