Changes for Emacs 24.3