Mashup of trunk v0906 and branch by Ian Campbel Contains Rebirth code
=> v0907
Copy of trunk v0906 to workbranch