Merge changes from downstream emacs.