Merge from emacs-24