1.1.2dev: Merged [11830] from 1.0-stable.
Authored by: rjollos 2013-07-12
Parent: [r11848]
Child: [r11850]