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