MERGE: pull in stuff from emacs-prelude branch