support for relative symlinks
Merge branch 'master' into develop