merge 18b1fc1596e9708a025336d7c31f698ad4bb2b01, refs #1123