Merged r3469, r3472 and r3473 from trunk.
Authored by: jplang 2010-02-28
Parent: [r3504]
Child: [r3506]