Merge 14.0.x up into 15.0.x#377

greg0ire merged 2 commits into

15.0.xdoctrine/coding-standard:15.0.xfrom

14.0.xdoctrine/coding-standard:14.0.xCopy head branch name to clipboard