Improve string type testing in Python 2.x versions
Merge branch '1.11' into 1.12

Conflicts:
	sites/www/changelog.rst