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