[ticket/12620] Fix rebase

PHPBB3-12620