Merge branch 'release/v2.0'
Merge branch 'release/v2.1'
Remove version numbers -- seems to break at least npm install
Merge branch 'hotfix/v2.1.1' into develop