1.1.1dev: merge [11439] from 1.0-stable (fix of #10768)
Authored by: jomae 2012-10-31
Parent: [r11439]
Child: [r11441]