merge [4292/branches/1.0], refs #1066