Update composer
Update composer
Update composer
Merge origin/master