Merge branch 'refs/heads/master' into release
Updated doctrine dependency
Merge branch 'refs/heads/Released/beta5' into release
Merge branch 'refs/heads/release'

Conflicts:
	composer.json