1.1.1dev: merge [11416] from 1.0-stable (fix for #10864)
Authored by: jomae 2012-10-25
Parent: [r11416]
Child: [r11418]