Merged r8231, r8235, r8236, 8237 from trunk (#9795).
Authored by: jplang 2012-02-04
Parent: [r8767]
Child: [r8769]