Apple notes, EFI
Merge remote-tracking branch 'upstream/master'