Merge branch 'master' into master

lib/Controller/Aria2Controller.php

@@ -186,7 +186,7 @@ class Aria2Controller extends Controller
             if ($row = $this->dbconn->getByGid($gid)) {
                 $filename = $row['filename'];
                 $timestamp = $row['timestamp'];
-                $extra = unserialize($row['data']);
+                $extra = $this->dbconn->getExtra(($row['data']));
             } else if (isset($value['files'][0]['path'])) {
                 $parts = explode("/", ($path = $value['files'][0]['path']));
                 if (count($parts) > 1) {

lib/Controller/MainController.php

@@ -32,7 +32,6 @@ class MainController extends Controller
         $this->uid = $UserId;
         $this->l10n = $IL10N;
         //$this->rootFolder = $rootFolder;
-        OC_Util::setupFS();
         $this->aria2 = $aria2;
         $this->aria2->init();
         $this->urlGenerator = \OC::$server->getURLGenerator();