Update composer.json
Merge remote-tracking branch 'upstream/master'