merging d531ae6a71aa67ae8883ce06ee056bdbae605d11 and removing changelog entry for the (now) duplicate committed in eaa2a61e3d9e6057d6fc01df57b04905b0ba8d95, refs #831 and #604