Update composer.lock
Merge branch 'master' into vagrant