Fix __toString method
Merge branch '2.1'
Fix deprecated render twig function
Merge remote-tracking branch 'refs/remotes/sonata/master'