Updates for emacs-24.3