Initial commit

Collation of changes made over the years to 3.2.beta2 - now 3.3