Fix so that symlinks are packaged as symlinks.
Merge branch 'bugfix/symlinks-changing-to-dirs' into develop