merged branch schmittjoh/patch-1 (PR #160)
merged branch schmittjoh/patch-1 (PR #160)

Commits
-------

eb2cb40 fixed previous commit
920a4a1 fixes a bug when a non-entity object is checked

Discussion
----------

fixes a bug when a non-entity object is checked

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