Merge branch 'master' into kingsley
composer update
Merge branch 'kingsley'