Merge branch 'master' of metalzone:public-git/lisp