Merge remote-tracking branch 'origin/staging' into staging
authorIan Jackson <ian.jackson@eu.citrix.com>
Tue, 17 Apr 2018 17:28:11 +0000 (18:28 +0100)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Tue, 17 Apr 2018 17:28:11 +0000 (18:28 +0100)

Trivial merge