Batch Update
Merge branch 'master' of https://github.com/ghandi9000/emacs