Merge branch 'jc/add-stop-at-symlink'