merge revisions #r8384, #r8387, #r8388, #r8389 and #r8390
treea2302e0bfabf2800b44870c8b14d3c75a12dc612
drwxr-xr-x - phpBB