composer.json update
Merge branch 'master' into feature/namespaces