update composer.json
Merge branch 'master' into release-2.0