HomeSoftware Heritage

Merge pull request #2123 from ekohl/fact-cleanup