Update composer.json
Merge remote-tracking branch 'origin/1.x'