HomeSoftware Heritage

Merge branch 'merge-dir-entries'