Merged r11526 and r11590 from trunk (#13341).
Authored by: jplang 2013-03-11
Parent: [r11590]
Child: [r11592]