Grub2 from bzr branch http://bzr.savannah.gnu.org/r/grub/trunk/grub, with bug #31647 fixed