Merge branch 'elisp-work'