merge [4200/branches/1.0], refs #1034