Add support for optimized contains
Add UPGRADE note
Add missing typehint
Remove useless docblock
Remove extra phpdoc
Remove BC notice
Enforce Criteria
Fix typo in exception message
ignore case when checking for existing methods to avoid redeclaration on update
Merge pull request #1049 from deeky666/DDC-3152

[DDC-3152] Fix redeclaration of methods on entity generation update
Merge pull request #1048 from MidnightDesign/patch-1

Fix typo in exception message
Fixed mismatch in expected exception message, see doctrine/doctrine2#1048
Allowing failures on hhvm-nightly, as the build chokes on composer installation for now (unrecognized console flags)
Merge branch 'hotfix/build-fix'
Drop Unicode character

It broke the LaTeX build.
Merge pull request #1058 from DavidPrevot/Unicode

Drop Unicode character
fix spacing for yaml example
Merge pull request #1059 from iampersistent/patch-3

fix spacing for yaml example
Create DDC3170Test.php

Added test for [DDC-3170] (http://www.doctrine-project.org/jira/browse/DDC-3170)
Fixed mapping of discriminator column

Added fix for [DDC-3170] (http://www.doctrine-project.org/jira/browse/DDC-3170).

When querying a simple entity which uses single table- or class table inheritance using simple object hydration (``AbstractQuery::HYDRATE_SIMPLEOBJECT``), the mapped discriminator column was not retrieved correctly.

If the column got an alias during result set mapping other than it's actual name (e.g. ``type34`` insteaad of ``type``) than this alias wasn't reverted when retrieving the discriminator column from the SQL result set.