Fix PHPBB3-11879
Merge branch 'air/style' into air/phpbb