Composer update
Composer updated php-cs for some reason...
Merge branch 'master' into dev-form