Merge changes made in revisions #r9405 to #r9467
tree008dc317ce03e80988c8c79f8c6d0cf263a02b32
drwxr-xr-x - code_sniffer
drwxr-xr-x - phpBB
drwxr-xr-x - tests