merge a1b9edb2d1cc7f2aaddb8e41d253215bab76588c, refs #1121