[Update] Masonry v0.4.0
Merge pull request #7092 from cloudkite/master

[Update] Masonry v0.4.0