Merged r11461, r11462 from trunk (#13251).
Authored by: jplang 2013-02-24
Parent: [r11462]
Child: [r11464]