1.1.2dev: Merged [11823:11825] from 1.0-stable (fix for #11152).
Authored by: rjollos 2013-07-12
Parent: [r11844]
Child: [r11846]