Merge from emacs--devo--0