Merged r3883, r3884 and r3885 from trunk.
Authored by: jplang 2010-07-25
Parent: [r3885]
Child: [r3887]