merge again, revisions 8516 to 8525
tree025fdf94609a4875d691f3580c5bee7ef407f9bc
drwxr-xr-x - code_sniffer
drwxr-xr-x - phpBB