From: Andrew G Cohen <cohen@andy.bu.edu>
Date: Sat, 3 Feb 2018 12:35:43 +0000 (+0800)
Subject: merge from master
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f8627cfbc52364709988b0b26a7236d7eb0251b4;p=emacs.git

merge from master
---

f8627cfbc52364709988b0b26a7236d7eb0251b4