Update to latest doctrine.

Fixes #689