merge [3575/branches/1.0], refs #904