merge [4319/trunk], refs #1057