1.1.1dev: merge [11420] from 1.0-stable (fix for #10912)
Authored by: jomae 2012-10-25
Parent: [r11420]
Child: [r11422]