fixed
Merge branch 'origin/2.3.1'

Conflicts:
	composer.json