Merge branch 'release/1.0' into develop
Merging the release back into develop
Version 2.0
Merge branch 'release/2.0'
Merging RC branch to master