Merge branch 'efi-vars' from Matthew Garrett