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