Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
composer.lock
Merge remote-tracking branch 'origin/master'
fix deprecated method