changelog entry for recent change, pull request 328.
Merge remote-tracking branch 'upstream/master' into issue_298

* upstream/master:
  changelog entry for recent change, pull request 328.

Conflicts:
	CHANGES.rst