merge in from trunk r8507->r8522
Authored by: stephenbayliss 2010-06-19
Parent: [r8651]
Child: [r8653]