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