https://github.com/doctrine/doctrine2/pull/970
Merge branch '2.4.5' into 2.4