Merging changes from https://github.com/squizlabs/PHP_CodeSniffer/commit/efc0ecf32d36a47b0e63106d2bd41b1704bb0d7e commit