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

Conflicts:
	sites/www/changelog.rst
Merge branch '1.12' into 1.13

Conflicts:
	paramiko/file.py
	paramiko/server.py
	paramiko/sftp_client.py
	sites/www/changelog.rst