Merge branch 'develop'
Bump version
Merge branch 'master' into develop