HomeSoftware Heritage

Merge pull request #845 from eputnam/MODULES-1508