Merge branch 'DDC-2437'
[DDC-2387] Fix DatabaseDriver not working with combinations of composite/association keys.
Merge branch 'DDC-2387'
[DDC-2430] Prevent Criteria queries using the ID of an assocation on PersistentCollections, as the in-memory ArrayCollection does not work with this kind of query. Attention this is a BC-BREAK, that is necessary to fix potentially very hard to debug bugs. Therefore it is not merged back into 2.3
Merge branch 'DDC-2430'
Mention BC BREAK in PersistentCollection#matching() more prominently.
Update annotations-reference.rst

Added missing @JoinColumns in the index
Merge pull request #661 from HarmenM/patch-1

Update annotations-reference.rst
Fixed a code block.
Sphinx does not like the way code was indented. Building the documentation raises the following error:
en/cookbook/resolve-target-entity-listener.rst:121: ERROR: Unexpected indentation.
[DDC-2335] Add note about filtering schema by regexp expression to relevant commands help output.
Merge pull request #662 from jakzal/code-block-fix

Fixed a code block.
Merge branch 'master' of github.com:doctrine/doctrine2
[DDC-2280] length attribute in <id> was not converted.
Merge branch 'DDC-2280'
Adding failing test to demonstrate DDC-2432

Loading proxies with invalid identifiers will currently mark them as initialized regardless of the failure
applying required fixes for DDC-2432
Merge pull request #663 from doctrine/hotfix/DDC-2432

Hotfix for DDC-2432
Merge pull request #639 from goetas/indexby-metadata

Added abillity to use metacolumn as indexBy
Fix regression in DDC-2430.
[DDC-2429] Fix xsd definition