Merge branch 'allow-emacs'
Merge branch 'autoenv'