Merge remote-tracking branch 'remotes/sstabellini/xen-2014-10-30' into staging