Merge branch '2.1' into 3.0

diff --cc files/lib/system/exporter/XF12xExporter.class.php
index 38e799a21a993f7e054c9dbf94d3ea452fb1e2e4,c1226c0d45c3cd35c035783aff2ac4be7cba0654..73191f735da8563f5dd38181854ea8430527364c
--- 1/files/lib/system/exporter/XF12xExporter.class.php
--- 2/files/lib/system/exporter/XF12xExporter.class.php
+++ b/files/lib/system/exporter/XF12xExporter.class.php
@@@ -1052,9 -999,9 +1052,9 @@@ class XF12xExporter extends AbstractExp
                        FROM            xf_poll_vote
                        ORDER BY        poll_response_id, user_id";
                $statement = $this->database->prepareStatement($sql, $limit, $offset);
-               $statement->execute([0]);
+               $statement->execute();
                while ($row = $statement->fetchArray()) {
 -                      ImportHandler::getInstance()->getImporter('com.woltlab.wbb.poll.option.vote')->import(0, array(
 +                      ImportHandler::getInstance()->getImporter('com.woltlab.wbb.poll.option.vote')->import(0, [
                                'pollID' => $row['poll_id'],
                                'optionID' => $row['poll_response_id'],
                                'userID' => $row['user_id']