bumped
Merge branch 'release-1.2.0' into develop
truncating
bumppppppp
Merge branch 'release-1.2.1' into develop