1.1.2dev: Merged [11821] from 1.0-stable (fix for #11117).
Authored by: rjollos 2013-07-12
Parent: [r11843]
Child: [r11845]