Move version constant to correct place
Merge branch 'hotfix-fixversion'