Merging branch master
A typo left in composer.json