Updated composer.json
Merge branch 'master' into 0.4.x-dev