Doctrine 2 - ORM

[GH-379] Fix join-poc merge