1.1.2dev: merge [11799] from 1.0-stable (fix of #11180)
Authored by: jomae 2013-05-09
Parent: [r11799]
Child: [r11801]