Include changes from downstream Emacs.