Merge upstream into master
authorIan Jackson <ian.jackson@citrix.com>
Fri, 24 Aug 2018 17:16:28 +0000 (18:16 +0100)
committerIan Jackson <ian.jackson@citrix.com>
Fri, 24 Aug 2018 17:16:28 +0000 (18:16 +0100)
Merging commit '733450b39b', which was the upstream for
4.11.1~pre+1.733450b39b-1~exp1, into HEAD.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Trivial merge