Merge branch 'master' of github.com:squizlabs/PHP_CodeSniffer