1.1.2dev: merge [11802] from 1.0-stable (fix of #10598)
Authored by: jomae 2013-05-10
Parent: [r11802]
Child: [r11804]