Merge branch 'mika/efi'