Merged r4720, r4724, r4738 from trunk.
Authored by: jplang 2011-01-27
Parent: [r4762]
Child: [r4764]