1.1.2dev: Merged [11827:11828] from 1.0-stable (fix for #11102).
Authored by: rjollos 2013-07-12
Parent: [r11846]
Child: [r11848]