Fixed grammar.
Merge branch 'release'
Merge branch 'master' into master_python2.3