Bump up version numbers
Merge branch 'release/v2.0' into develop