Merge 12.0.x up into 13.0.x#337

greg0ire merged 11 commits intodoctrine:13.0.xdoctrine/coding-standard:13.0.xfrom

greg0ire:13.0.xgreg0ire/coding-standard:13.0.xCopy head branch name to clipboard