Merge branch 'emacs-24'