Changes for Emacs 24.4.x