forgot this file in 1bc69b2264515ba328e0afdd7abf767dbfa9a157, closes #1116 (again)
merge [4394/branches/1.0]