Merge in from trunk to r8759 (last merge was in fact to r8757)
Authored by: stephenbayliss 2010-08-16
Parent: [r8759]
Child: [r8761]