hf104 commit
Merge branch 'dev' of https://github.com/matt-e-king/testing-git into dev