Merge in r8934
tree613df3b719a62c59623d4f5ba1cd883fa53f1455
drwxr-xr-x - code_sniffer
drwxr-xr-x - phpBB
drwxr-xr-x - tests