Merged r11509 and r11512 from trunk (#13309).
Authored by: jplang 2013-03-01
Parent: [r11513]
Child: [r11515]