Try 800x600 as the default EFI video mode
Merge remote-tracking branch 'upstream/master'