Code sniffer bug
Merge remote branch 'upstream/master' into feature-CodesnifferFixes-1820