merge [3979/branches/1.0], refs #988