Fix bug PHPBB3-11879
Merge branch 'elegance/style' into elegance/black/style