1.0dev: merged [11222] from 0.12-stable (#10810)
Authored by: jomae 2012-08-30
Parent: [r11222]
Child: [r11224]