Attribution to that jerk @offbyone in 1.6 changelog
Merge branch '1.6' into 1.7

Conflicts:
	docs/changelog.rst
Merge branch '1.7'