Merge branch 'upstream/core' into upstream/xen