Backported r11233 from trunk (#12833).
Authored by: jplang 2013-01-20
Parent: [r11233]
Child: [r11235]
