Merged r6163, r6171, r6172, r6174 from trunk.
Authored by: jplang 2011-07-03
Parent: [r6174]
Child: [r6176]