Abort when env.hosts=<str> re #861
Changelog re #861
Switch up re #681 to be nice and not complain
Merge branch '861-int' into 1.6

Conflicts:
	docs/changelog.rst