1.0.1dev: merge from 0.12-stable (fix of #10967)
Authored by: jomae 2012-11-27
Parent: [r11473]
Child: [r11475]