Merge branch 'develop' of github.com:tpb-hydra/component-cf into develop

Conflicts:
	src/Hydra/Component/ContentFixer/ContentFixer.php
Merge branch 'master' of github.com:tpb-hydra/component-cf into develop