HomeSoftware Heritage

Merge pull request #672 from rbelnap/compose-fix