merge [4106/branches/1.0], refs #1015