Updated wip-elisp branch onto master.