Updated user module dependency
Merge branch 'refs/heads/beta4' into release
Merge branch 'refs/heads/release'

Conflicts:
	composer.json