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