Merge GRUB MBR fix

Hey, pull requests are awesome!