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