feature list proposal
Update composer.json
Merge remote-tracking branch 'upstream/master' into upstream
merged upstream