; Merge from origin/emacs-25
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 25 Oct 2016 19:50:31 +0000 (12:50 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 25 Oct 2016 19:50:31 +0000 (12:50 -0700)
The following commit was skipped:

32827b3 Default REL_ALLOC to 'no'


Trivial merge