Squashing commits for PR
Merge branch 'master' of https://github.com/bjdixon/qmo-tests