Merge in historical versions. These versions were mangled so they are of no use for blame

Merge branch 'historical'