Adding contrib file
Merge branch 'master' into phpcs-fixer
Different coding standard for 2.x