HomeSoftware Heritage

Merge pull request #409 from voxpupuli/revert-407-master