Merge remote-tracking branch 'remotes/origin/3.0' into 3.0

Conflicts:
	Tests/DBAL/Types/AbstractEnumTypeTest.php