Merge branch 'release-2.1.0'
Fix version update exception
Update to 2.1.1
Merge branch 'hotfix-2.1.1' into develop