Merged r11762 and r11763 from trunk (#13783).
Authored by: jplang 2013-05-12
Parent: [r11834]
Child: [r11836]