Fix 884
Merge branch '1.6'

Conflicts:
	docs/changelog.rst