Merge tag 'emacs-25.1' into deb/emacs25/d/sid/upstream
authorRob Browning <rlb@defaultvalue.org>
Mon, 26 Sep 2016 21:13:06 +0000 (16:13 -0500)
committerRob Browning <rlb@defaultvalue.org>
Mon, 26 Sep 2016 21:13:06 +0000 (16:13 -0500)

Trivial merge