Merge 2.2.x up into 2.3.x#430

greg0ire merged 6 commits into2.3.xdoctrine/collections:2.3.xfrom

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