PHPBB3-16308 Checklist: Correct branch: master for new features; 3.3.x & 3.2.x for fixes Tests pass Code follows coding guidelines: master, 3.3.x and 3.2.x Commit follows commit message fo...