Release 1.5.3
Merge branch '1.5'

Conflicts:
	fabric/version.py