Merge emacs bug fixes from release