1.1.2dev: merge from 1.0-stable (fix for #11162)
Authored by: jomae 2013-06-03
Parent: [r11812]
Child: [r11814]