Merge remote-tracking branch 'sstabellini/xen-next' into staging