Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs