Release 1.5.2
Merge branch '1.5'

Conflicts:
	docs/changelog.rst
	fabric/version.py