Merge remote-tracking branch 'remotes/sstabellini/xen-2015-01-26' into staging