1.0.1dev: merge [11415] from 0.12-stable (fix for #10864)
Authored by: jomae 2012-10-25
Parent: [r11415]
Child: [r11417]