Please, pick commit cc4a31beeb50751875e0394672372e13eb4475aa (from the grub-support branch) in order to have GRUB reclaiming in the master branch. Thanks.