HomeSoftware Heritage

Merge pull request #1304 from cspeterson/master