merge [4033/branches/1.0], refs #1001