merge [4201/branches/1.0], refs #1035