Adding branch alias back to composer.json
Merge branch 'develop'
Merge branch 'master' into develop