Merged r10865 and r10866 from trunk (#12431).
Authored by: jplang 2012-11-23
Parent: [r10872]
Child: [r10874]