Update composer deps
Merge branch 'master' into release-beta
Updating machado to the right branch