Ensure we follow the symlink to get the right GRUB location.
Merge branch 'master' into debian
4.0.3-1