Merge emacs25 (25.2+1-6) import into refs/heads/workingbranch
authorRob Browning <rlb@defaultvalue.org>
Tue, 12 Sep 2017 02:51:49 +0000 (03:51 +0100)
committerRob Browning <rlb@defaultvalue.org>
Tue, 12 Sep 2017 02:51:49 +0000 (03:51 +0100)

Trivial merge