Ticket/13234 2

Replaces https://github.com/phpbb/phpbb/pull/3089