Merge branch 'tutitututu-master'
Commit composer.lock file after previous pull request