Merge branch 'jt/merge-recursive-symlink-is-not-a-dir-in-way'