Merge 3.2.x up into 3.3.x#2202

ostrolucky merged 9 commits into3.3.xdoctrine/DoctrineBundle:3.3.xfrom

3.2.xdoctrine/DoctrineBundle:3.2.xCopy head branch name to clipboard