Merge branch '2.1'

diff --cc files/lib/system/exporter/VB3or4xExporter.class.php
index 77942be4921f3f6ba47db685c90bf13746ffcfb8,8030d52a8345aa6c149791dfd59bca02792c7b52..2bde4c265540fb819364d36d0dfcd8c7fca528b7
--- 1/files/lib/system/exporter/VB3or4xExporter.class.php
--- 2/files/lib/system/exporter/VB3or4xExporter.class.php
+++ b/files/lib/system/exporter/VB3or4xExporter.class.php
@@@ -390,13 -385,14 +390,14 @@@ class VB3or4xExporter extends AbstractE
                                'oldUsername' => '',
                                'registrationIpAddress' => UserUtil::convertIPv4To6($row['ipaddress']), // TODO: check whether this is the registration IP
                                'signature' => $row['signature'],
+                               'signature' => self::fixBBCodes($row['signature']),
                                'userTitle' => ($row['customtitle'] != 0) ? StringUtil::decodeHTML($row['usertitle']) : '',
                                'lastActivityTime' => $row['lastactivity']
 -                      );
 -                      $additionalData = array(
 +                      ];
 +                      $additionalData = [
                                'groupIDs' => explode(',', $row['membergroupids'].','.$row['usergroupid']),
 -                              'options' => array()
 -                      );
 +                              'options' => []
 +                      ];
                        
                        // handle user options
                        foreach ($userOptions as $optionID) {