HomeSoftware Heritage

Merge pull request #679 from skrussell/master