merge 0a5f087d27268e61e46847a0f60fdf8e431f571c, 6db3e016f0a337c353cf812d2e991f721d4209ad, refs #1041