Merge upstream GRUB changes

Nothing exiting here, just don't want to stay in sync.