Merge branch 'develop'
Merge branch 'develop'
Updated master composer deps
Update composer deps
Updated deps
Updated page layouts. Found another bug dealing with array/objects. Not sure how this wasn't found before?
Merge branch 'master' into develop