Merge 2.2.x into 2.3.x#191

alcaeus merged 3 commits into2.3.xdoctrine/persistence:2.3.xfrom

2.2.xdoctrine/persistence:2.2.xCopy head branch name to clipboard