Merge changes made in Emacs trunk