merge r8956, r8957 and r8960
tree4a24c7861d50bc475f27220b3eb317bf09e836dd
drwxr-xr-x - code_sniffer
drwxr-xr-x - phpBB
drwxr-xr-x - tests