Bugfix in composer.json
Merge origin/dev-master into dev-master