Cut 1.9.2
Merge branch '1.9' into 1.10

Conflicts:
	fabric/version.py
Cut 1.10.1
Merge branch '1.10'