Fix bug PHPBB3-11879
Merge branch 'phantom/style' into phantom/phpbb