1.1.1dev: merge from 1.0-stable (fix for #10940)
Authored by: jomae 2012-12-05
Parent: [r11476]
Child: [r11478]