Merge branch 'emacs-mode-underscore-in-symbol' into release