Merge changes from emacs-23