some missing merges...
treea40f2b1ef829f8975f1ef5122d3158feece75862
drwxr-xr-x - code_sniffer
drwxr-xr-x - phpBB
drwxr-xr-x - tests