Merge branch 'emacs-master' (.emacs.d github repo)