Merge branch 'release-2.1.1'
Move version constant to correct place
Merge branch 'hotfix-fixversion' into develop