Merge "Fix bug in directory depth counting."