merge [3982/branches/1.0], refs #991