Composer update
Merge origin/master