[FIX] Trad
Merge pull request #599 from Th3Mouk/patch-1

[FIX] Trad
Merge remote-tracking branch 'sonata-project/master'