Merge branch 'pc/dir-count-slashes'