Update composer.json
Merge remote-tracking branch 'upstream/develop' into feature/vivo-module-standalone

Conflicts:
	composer.json