Bump Doctrine dependency down to latest stable.
Merge branch '4.0'