merge f4208dc28d70b6961dde123e3d5fbbbb643f2541...8f484b4b037e2b97fe09e3d79b4d739bc442a656 (from 1.0), refs #977