Merge branch 'version-1.2'