small encryption/efi note
Merge remote-tracking branch 'upstream/master'