Cut 1.11.6
Merge branch '1.11' into 1.12

Conflicts:
	paramiko/__init__.py
	setup.py
Cut 1.12.4