Merge in from trunk r8741-r8761
Authored by: stephenbayliss 2010-08-16
Parent: [r8761]
Child: [r8763]