Merge 2.18.x up into 3.2.x#2201

greg0ire merged 7 commits into

doctrine:3.2.xdoctrine/DoctrineBundle:3.2.xfrom

greg0ire:3.2.xgreg0ire/DoctrineBundle:3.2.xCopy head branch name to clipboard