Merged r12017 and r12027 from trunk (#14422).
Authored by: jplang 2013-07-28
Parent: [r12064]
Child: [r12066]