Integrate changes from downstream Emacs.