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