; Merge from origin/emacs-25
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 7 Dec 2016 20:41:05 +0000 (12:41 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 7 Dec 2016 20:41:05 +0000 (12:41 -0800)
The following commits were skipped:

c491989 Port to Sun C 5.14
95eb641 Fix mail-combine-fields


Trivial merge