Merged r6300 and r6302 from trunk (#8836).
Authored by: jplang 2011-11-11
Parent: [r7766]
Child: [r7768]