; Merge from emacs-26