Merge branch 2.0 into 'master'