tweaked previous merge
tweaked previous merge

chalasr/SensioFrameworkExtraBundle,sensiolabs/SensioFrameworkExtraBundle,xabbuh/SensioFrameworkExtraBundle,chalasr/SensioFrameworkExtraBundle,henrikbjorn/ParamConverter