Merged r9782, r9784, r9794 from trunk.
Authored by: jplang 2012-06-09
Parent: [r9794]
Child: [r9796]