Attempted fix re: #593
Changelog re #593, fixes #593
Merge branch '1.6'

Conflicts:
	docs/changelog.rst