Merged r4913, r4914, r4916 from trunk.
Authored by: jplang 2011-03-06
Parent: [r5012]
Child: [r5014]