ported from dev and redacted for github
Merge branch 'master' of github.com:astockwell/grade-machine