Cut 1.10.5
Merge branch '1.10' into 1.11

Conflicts:
	paramiko/__init__.py
	setup.py
Cut 1.11.3
Merge branch '1.11' into 1.12

Conflicts:
	paramiko/__init__.py
	setup.py
Cut 1.12.1
Merge branch '1.12'