Merge changes from downstream Emacs.