Properly handle spaces in directory/symlink names
Merge branch 'marks'