update composer.json
Merge branch 'master' into 2.0.0
Update composer.json
Merge branch '2.0.0'