Merge remote-tracking branch 'remotes/sstabellini/tags/xen-2016-04-20' into staging