doctrine/doctrine2 — pull request #1231 by aivus (2014-12-26 14:26:34+00:00)
Title: Backport 'Merge pull request #1098 from encoder32/DDC-1590' to 2.4 branch

Backport #1098 to 2.4 branch