Backported r2573, r2591 and r2592 from trunk.
Authored by: jplang 2009-03-15
Parent: [r2592]
Child: [r2594]
