Merge branch 'release-2.1.0' into develop
fix error in versionName 2.0.112 to 2.1
Merge branch 'develop'