Using 5.0 as dependency
Merge branch '4.1' into 5.0

Conflicts:
	composer.json
Updated dependencies
Merge branch '5.0' into 4.1

Conflicts:
	composer.json
Updated dependencies