Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into emacs-25