merge 97d957f7d59afc3b33404015fab52d7b4c41649b, refs #1072