Merged r11331 and r11333 from trunk (#13075).
Authored by: jplang 2013-02-12
Parent: [r11362]
Child: [r11364]