Use Doctrine_Core not Doctrine
Merge commit '3f6233258586e633ac237aea32d55552233dcba0'