Merge branch 'hotfix/1.2'
version bump
Merge branch 'hotfix/1.2.1' into develop