1.1.1dev: merge from 1.0-stable (fix of #11012)
Authored by: jomae 2013-01-14
Parent: [r11510]
Child: [r11512]