Hacking on hardware and lots of other changes
Merge branch 'master' into gh-pages