1.1.2dev: merge [11790] from 1.0-stable (fix of #11167, #10514 and #10390)
Authored by: jomae 2013-04-24
Parent: [r11790]
Child: [r11792]