1.1.2dev: merge [11833] from 1.0-stable (fix for #11215)
Authored by: jomae 2013-06-30
Parent: [r11833]
Child: [r11835]