Merged r9424, r9426, r9433 from trunk.
Authored by: jplang 2012-04-20
Parent: [r9456]
Child: [r9458]
