Merge branch 'master' of git+ssh://guvnor.distorted.org.uk/~mdw/src/lisp