Update composer.json
Merge remote-tracking branch 'origin/master' into 2.3
Update composer.json