HomeSoftware Heritage

Merge branch 'master' into maint_modsync_384f4c1