Merge branch 'master' of /home/mdw/public-git/lisp