Merged Thierry's symlink fix