Bump the version for release
Merge branch 'develop'
Merge branch 'master' into develop
bump version for development