1.0.1dev: merge [11419] from 0.12-stable (fix for #10912)
Authored by: jomae 2012-10-25
Parent: [r11419]
Child: [r11421]