Modifications for emacs 24.3, wip