Merged r11827 to r11833 from trunk (#14015).
Authored by: jplang 2013-07-11
Parent: [r11995]
Child: [r11997]