Merge branch 'release-1.2'
Merge remote-tracking branch 'origin/master' into develop
Merge remote-tracking branch 'origin/develop' into develop