Merge commit 'origin/master' into for-linus/xen/master