Also included in: https://github.com/phpbb/phpbb/pull/2517