merging 32bfbec483f8941992d9ba1afc3ea2792175dd13 and removing changelog entry for the (now) duplicate committed in ca9ba934c0f896811514d5b064a73a7b406792da, refs #755 and #529