Merge branch 'master' of /srv/git/moonshot