Stumptray preliminaries.
Merge branch 'master' of github.com:josteink/machine-build