From: Noam Postavsky <npostavs@gmail.com>
Date: Sun, 3 Jun 2018 16:55:37 +0000 (-0400)
Subject: ; Merge: backports from master
X-Git-Tag: emacs-26.1.90~396
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9a14b4d1ce84e5e0739572729670b8f10d234097;p=emacs.git

; Merge: backports from master
---

9a14b4d1ce84e5e0739572729670b8f10d234097