[ticket/11444] Fix rebase

PHPBB3-11444