1.1.1dev: merge from 1.0-stable (fix of #10980)
Authored by: jomae 2012-12-14
Parent: [r11482]
Child: [r11484]