merge revisions: #r8359, #r8360, #r8368
tree8d2fe110a9af4b52f5766c0a64d77e35bb8b1ec9
drwxr-xr-x - phpBB