backport of bfe9171c2c14d2d1ca9e21bcfb0d810c28a37ae5 from trunk, closes #670 (and includes the CHANGELOG entry this time!)
merge e1d8d28ef4fbcd5df3ef23a9cd30f0839b27d009, refs #670