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