Backport alex/patch-2, Python trove classifiers
Indent/order shuffle, no actionable changes
Merge branch '1.11' into 1.12

Conflicts:
	setup.py
Forgot python 2.5
Merge branch '1.11' into 1.12