Too many 'catch & patch'
Merge branch '1.7' into 1.8

Conflicts:
	docs/changelog.rst
Merge branch '1.8'
Try figuring out Travis failure :(
Upgrade test to not make umask assumptions
Merge branch '1.7' into 1.8
Merge branch '1.8'
Cut 1.7.2
Merge branch '1.7' into 1.8

Conflicts:
	fabric/version.py
Formatting
Merge branch '1.7' into 1.8
Cut 1.8.2
Merge branch '1.8'