merge r8970 and r8971
tree286b1fbdd7bfd2e7a5ddbd6f363e8d8dc478516a
drwxr-xr-x - code_sniffer
drwxr-xr-x - phpBB
drwxr-xr-x - tests