1.1.2dev: merge from 1.0-stable (fix for #11186 and #11194)
Authored by: jomae 2013-06-01
Parent: [r11809]
Child: [r11811]