emacs RC changes
Merge commit '1e08063'