Bumped version.
Merge branch 'release' into release_python2.3
Merge branch 'release_python2.3' into master_python2.3