Merged r11641 and r11642 from trunk (#8794).
Authored by: jplang 2013-03-19
Parent: [r11655]
Child: [r11657]