1.1.2dev: Merged [12458] from 1.0-stable (fix for #10138).
Authored by: rjollos 2014-01-19
Parent: [r12458]
Child: [r12460]