merge 68d51666fd1efabca17c9435ce8a8c0f339f4be2, refs #1093