5.2 changes to main directory

Replaced main branch files with 5.2 branch files. 5.1 files were placed
in a separate directory last commit.
Re-fix typo
Merge branch 'master' of https://github.com/chipturner/mw