merge [4045/branches/1.0], refs #1006