Coding standards fix
Merge branch 'master' into phpcs-fixer