1.0.1dev: merge [11438] from 0.12-stable (fix of #10768)
Authored by: jomae 2012-10-31
Parent: [r11438]
Child: [r11440]