Merge branch 'dt/cat-file-follow-symlinks'