Trying to fix packagist
Merge branch 'hotfix/packagist'
Merge branch 'master' into develop