merge [3833/branches/1.0], [3835/branches/1.0], refs #958