Merge branch 'refs/heads/master' into release
Updated dependencies
Merge branch 'refs/heads/Released/beta15' into release

Conflicts:
	composer.json
Merge branch 'refs/heads/release'