Merge remote-tracking branch 'remotes/sstabellini-http/tags/xen-20180531-tag' into...