Merge branch 'master' of www.project-moonshot.org:/srv/git/moonshot