Update Macaw to 1.0.6
Merge pull request #4075 from xtian/macaw-1.0.6

Update Macaw to 1.0.6