macaw 1.5.8
Merge pull request #6792 from exherb/macaw-1.5.8

Update macaw to 1.5.8