Merge branch 'emacs24'