[ticket/12270] Fixed rebase conflicts

PHPBB3-12270