Merged r11519 and r11520 from trunk (#13335).
Authored by: jplang 2013-03-09
Parent: [r11568]
Child: [r11570]