Merge from emacs-24 branch