Merge 3.4.x up into 4.1.x#463

greg0ire merged 5 commits intodoctrine:4.1.xdoctrine/persistence:4.1.xfrom

greg0ire:4.1.xgreg0ire/persistence:4.1.xCopy head branch name to clipboard