Updated composer.json
Merge branch '2.4'

Conflicts:
	composer.json