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