Simpler abbreviation for the formatter.
Merge branch 'master' into master_python2.3