Merge [4234/trunk], fixes #1049 for branches/1.0