Bump version number to 2.3
Merge branch 'release-2.3' into develop