Backport #610 in 2.4(.4), update release notes
Merge branch '2.4'

Conflicts:
	release-notes/CREDITS