1.1.2dev: Merged [12460] from 1.0-stable.
Authored by: rjollos 2014-01-19
Parent: [r12460]
Child: [r12462]