Merge branch '2.0'

diff --cc files/lib/system/exporter/PhpBB3xExporter.class.php
index a07a84efabd41f248c958678ffedb075ab13e9a2,03a78124800ee83dc41a7832af4f94a7939351e2..a269bd09e823d5c2346c5fdbf12d8fee245250d9
--- 1/files/lib/system/exporter/PhpBB3xExporter.class.php
--- 2/files/lib/system/exporter/PhpBB3xExporter.class.php
+++ b/files/lib/system/exporter/PhpBB3xExporter.class.php
@@@ -1008,9 -968,9 +1008,9 @@@ class PhpBB3xExporter extends AbstractE
                                        (SELECT COUNT(DISTINCT vote_user_id) FROM ".$this->databasePrefix."poll_votes votes WHERE votes.topic_id = topic.topic_id) AS poll_votes
                        FROM            ".$this->databasePrefix."topics topic
                        WHERE           poll_start <> ?
 -                      ORDER BY        topic_id ASC";
 +                      ORDER BY        topic_id";
                $statement = $this->database->prepareStatement($sql, $limit, $offset);
-               $statement->execute(array('post'));
+               $statement->execute(array(0));
                while ($row = $statement->fetchArray()) {
                        ImportHandler::getInstance()->getImporter('com.woltlab.wbb.poll')->import($row['topic_id'], array(
                                'objectID' => $row['topic_first_post_id'],