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)
commitb31a6bff8f73e6a82f2979ae10f00b7bb4fa3045
tree4c9b3b63b30f730861916339fb2b74b1dd47be2c
parent9b2a1971a9dd6e2634c004bc9bd8f720ff1ceed7
parent733450b39b83d7891ddd931399beef93e1edbf33
Merge upstream into master

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>