Merge branch 'efi/urgent' into efi/core, to pick up fixes