Merged r10580 and r10581 from trunk.
Authored by: jplang 2012-10-26
Parent: [r10721]
Child: [r10723]