Merge branch 'hotfix/2.0.11'
Merge branch 'release/2.1.0'
bump version number
exclude xml-rpc from redirect
Merge branch 'hotfix/2.1.1' into develop