Clean up
Merge branch '2.5'
Updated composer.json
Updated composer.json
Merge branch '2.5'