Merging revisions #r8352, #r8353, #r8354 and #r8355
treef340744a2a71bcd93f028e281b4924fb087aacc1
drwxr-xr-x - phpBB