Merge latest version of upstream code sniff by TYPO3.