Merge branch 'master' into merge_1.0