Merge from origin/emacs-24