merge [4120/branches/1.0], refs #1025