Merge changes from emacs-24 branch