Dc 880drak

This PR is based on a PR on doctrine/doctrine: https://github.com/doctrine/doctrine1/pull/13