Merged r12163 from trunk (#14590, #14592).
Authored by: jplang 2013-10-13
Parent: [r12210]
Child: [r12212]
