Update composer.json
Merge branch '1.5/develop' into develop