merge 403b63cf5df18d6a453c90309f36449c2506af2c, refs #1154