1.1.2dev: merge [11842] from 1.0-stable (fix for #9973)
Authored by: jomae 2013-07-07
Parent: [r11842]
Child: [r11844]