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