Merge remote-tracking branch 'origin/emacs-24'