[ticket/13082] Join classes

PHPBB3-13082