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