Cut 1.7.5
Merge branch '1.7' into 1.8

Conflicts:
	fabric/version.py
Cut 1.8.5