Merge branch 'release-1.2' into develop
bump 1.5
Merge branch 'develop'