Cut 1.6.2
Fixes to release junk
Merge branch '1.6'

Conflicts:
	docs/changelog.rst
Cut 1.7 final