; Merge from origin/emacs-25
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 5 Aug 2016 21:07:00 +0000 (14:07 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 5 Aug 2016 21:07:00 +0000 (14:07 -0700)
The following commit was skipped:

d039fc4 ; Auto-commit of loaddefs files.


Trivial merge