Added composer
(cherry picked from commit 5e2c70a)
Composer settings
Merge remote-tracking branch 'origin/master'