Merge branch 'master' of moonshot.suchdamage.org:/srv/git/moonshot