merge nils' changes into 3.2.x (i am still not sure if we want to have them in 3...
treed565f163b3b57dadec23ebafa2e86c639c0499dc
drwxr-xr-x - code_sniffer
drwxr-xr-x - phpBB
drwxr-xr-x - tests