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