main emacs changes
Merge branch 'old-master'