Merge 3.3.x up into 3.4.x#11921

greg0ire merged 13 commits into3.4.xdoctrine/orm:3.4.xfrom

3.3.xdoctrine/orm:3.3.xCopy head branch name to clipboard