Merging revisions #r8346, #r8347 and #r8348
treeb9c2f876617ee14253fe9d36b3520b2464497eaa
drwxr-xr-x - phpBB