Merge branch 'release/0.12.0' into develop
Merge branch 'master' into develop
bump version to 0.12.1
Merge branch 'release/0.12.1'