Bump version number
Merge branch 'release/1' into develop