Fix bug where _pty_size() returns unreasonable rows/cols in Emacs
Changelog re #956, fixes #956
Merge branch '1.5' into 1.6
Merge branch '1.6' into 1.7

Conflicts:
	docs/changelog.rst
Merge branch '1.7' into 1.8
Merge branch '1.8'
Cut 1.5.5
Merge branch '1.5' into 1.6

Conflicts:
	fabric/version.py
Merge branch '1.6' into 1.7

Conflicts:
	docs/changelog.rst
	fabric/version.py
Cut 1.6.4
Merge branch '1.6' into 1.7

Conflicts:
	docs/changelog.rst
	fabric/version.py
Cut 1.7.1
Bump Releases for explicit-release feature
Note that 1.6.4 and 1.5.5 only got a couple bugfixes
Merge branch '1.7' into 1.8

Conflicts:
	fabric/version.py
Cut 1.8.1
Merge branch '1.8'