Merge remote-tracking branch 'remotes/sstabellini/tags/xen-2015-12-22' into staging