1.1.2dev: Merged [12464:12465] from 1.0-stable. Refs #11458.
Authored by: rjollos 2014-01-27
Parent: [r12465]
Child: [r12467]