1.1.2dev: Merged [11829] from 1.0-stable.
Authored by: rjollos 2013-07-12
Parent: [r11847]
Child: [r11849]