Preparing for merge before pull
Merge branch 'master' of https://github.com/jcriner/emacs