Updated to Emacs 24.4