4f585a3d63
Conflicts: UPGRADE.md lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php
Conflicts: UPGRADE.md lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php