Changes from home
Merge remote-tracking branch 'github/emacs' into emacs