Fix #580
Merge branch '2.4'

Conflicts:
	release-notes/CREDITS