Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/catacomb