Merged r9719, r9726, r9727 from trunk.
Authored by: jplang 2012-05-27
Parent: [r9728]
Child: [r9730]