merge [3828/branches/1.0]