Merge branch 'release/2.1.2' into develop
Update version in README.md
Merge branch 'develop'