1.1.2dev: Merged [12452] from 1.0-stable. Refs #11440.
Authored by: rjollos 2014-01-19
Parent: [r12454]
Child: [r12456]