bump version
Merge branch 'release/1.2.0' into dev