Update composer.json.
Merge branch 'master' of https://github.com/stocarul/PDODblibBundle

Conflicts:
	composer.json