Incorporated John D Ramsdell's updates.
Authored by: simonjwright 2010-10-20
Parent: [r78]
Child: [r80]
