Comment added about a Python 2.6+ syntax (for when Python 2.5 compatibility is dropped).
Merge branch 'master' into release
Simpler output.
Merge branch 'release'