1.1.1dev: merge from 1.0-stable (fix of #10997)
Authored by: jomae 2013-01-15
Parent: [r11512]
Child: [r11514]