Merged r7920, r7921, r7922 and r7924 from trunk (#9405).
Authored by: jplang 2011-12-10
Parent: [r8157]
Child: [r8159]