Merge remote-tracking branch 'origin/version-1.2.0' into master