1.1.1dev: merge from 1.0-stable (fix for #10541)
Authored by: jomae 2012-12-06
Parent: [r11478]
Child: [r11480]