1.1.2dev: merge [11835] from 1.0-stable (fix for #11198)
Authored by: jomae 2013-07-07
Parent: [r11835]
Child: [r11837]