Merge remote-tracking branch 'efi/urgent' into x86/urgent