Merge branch 'master' of github.com:r-darwish/emacs
Merge branch 'master' into unstable