Change of composer.json
Change of composer.json
Merge origin/master