From: John Wiegley <johnw@newartisans.com>
Date: Mon, 4 Dec 2017 20:10:26 +0000 (-0800)
Subject: Merge branch 'master' into next
X-Git-Tag: emacs-29.0.90~1306^2~15^2~158
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=08e5406cc3;p=emacs.git

Merge branch 'master' into next
---

08e5406cc3fe78899be86bc1cd8ca26afbb728ac