Merge branch '5.5'

diff --cc files/lib/system/exporter/IPB3xExporter.class.php
index 3dd7b4f12bd646c2cb30b61550dc7fc8f758a20d,1f05a3ebaee2c634850b54af9ebe166e3d95ed44..f8d63f4d882c83b73360d67a1c5bfd0b6e097d01
--- 1/files/lib/system/exporter/IPB3xExporter.class.php
--- 2/files/lib/system/exporter/IPB3xExporter.class.php
+++ b/files/lib/system/exporter/IPB3xExporter.class.php
@@@ -250,9 -250,10 +250,9 @@@ final class IPB3xExporter extends Abstr
                  'registrationDate' => $row['joined'],
                  'banned' => $row['member_banned'],
                  'registrationIpAddress' => UserUtil::convertIPv4To6($row['ip_address']),
 -                'enableGravatar' => (!empty($row['pp_gravatar']) && $row['pp_gravatar'] == $row['email']) ? 1 : 0,
                  'signature' => self::fixMessage($row['signature']),
                  'profileHits' => $row['members_profile_views'],
-                 'userTitle' => $row['title'] ?: '',
+                 'userTitle' => $row['title'] ? self::fixSubject($row['title']) : '',
                  'lastActivityTime' => $row['last_activity'],
              ];
  

diff --cc files/lib/system/exporter/WBB4xExporter.class.php
Simple merge