; Merge from origin/emacs-26