Upgrade to doctrine 2.4.