CPP-PHP extension optimization
Merge branch 'master' of https://github.com/intaro/hstore-bundle

Conflicts:
	DBAL/Types/HStoreType.php