committing after various reset testing
Merge branch 'master' of https://github.com/contrapublic/manuka