merge e36ae3fd15b98c832d3ee6a4b32a5b15f0f32dff, refs #1075