Apply slightly modified version of patch from #162
Changelog entry re #162
Merge branch '1.10' into 1.11

Conflicts:
	NEWS
Clone changelog entry for 1.11
Merge branch '1.11'