Merge branch 'master', remote branch 'origin/master' into 1.1.x
Merge branch '1.2.x'