Gah
Merge branch '1.7' into 1.8

Conflicts:
	fabric/version.py
Gah part 2