merge [3551/branches/1.0], refs #895