Merge branch 'master' into Geoffs_WIP
Merge branch 'master' into Geoffs_WIP
Merge branch 'master' into Geoffs_WIP
Fixed typos, spelling errors

also some jokes
Merge branch 'Geoffs_WIP'