Merging changes from https://github.com/squizlabs/PHP_CodeSniffer/commit/7d5479190c916a7b07439626ce868f6ddb391f66 commit
Merging changes from https://github.com/squizlabs/PHP_CodeSniffer/commit/13877e17a9a3cc2b1acd74c614eb98bd05acc89b commit