merge [3915/branches/1.0]