Credits
Merge branch 'master' of https://github.com/vmalloc/emacs
Merge branch 'master' into unstable