Merge branch 'release-1.x'
Merge branch 'develop' into release-2.x
Updated README.md