Merge branch 'refs/heads/master' into release
Updated module dependencies
Merge branch 'refs/heads/beta9' into release

Conflicts:
	composer.json
Rollback to dev dependencies
Merge branch 'refs/heads/release'