1.1.1dev: merge from 1.0-stable (fix of #10967)
Authored by: jomae 2012-11-27
Parent: [r11474]
Child: [r11476]