HomeSoftware Heritage

Merge pull request #632 from voxpupuli/puppet7