merge c560a55496d45d0444c62b9e4908b91155240c74, refs #1102