Merge pull request #1084 from ffainelli/hfsprogs