Merge in from trunk r8621 to r8651
Authored by: stephenbayliss 2010-06-21
Parent: [r8654]
Child: [r8656]