Cut 1.5.5
Merge branch '1.5' into 1.6

Conflicts:
	fabric/version.py
Cut 1.6.4