Tighten up configuration definition
Merge remote-tracking branch 'origin/2.5'

Conflicts:
	src/VIPSoft/DoctrineDataFixturesExtension/Extension.php