Merge commit 'efi-for-3.7-v2' into x86/urgent