1.0.2dev: merge [11788-11789] from 0.12-stable (fix of #11167, #10514 and #10390)
------------------------------------------------------------------------
Authored by: jomae 2013-04-24
Parent: [r11789]
Child: [r11791]