Merged with Doctrine sandbox, major update, configured to work with Doctrine 2 now