Merge remote-tracking branch 'upstream/master' into develop

bin/mage

@@ -18,6 +18,8 @@ define('MAGALLANES_DIRECTORY', $baseDir);
 
 if (file_exists(__DIR__ . '/../vendor/autoload.php')) {
     require_once __DIR__ . '/../vendor/autoload.php';
+} else if (file_exists(__DIR__ . '/../../../autoload.php')) {
+    require_once __DIR__ . '/../../../autoload.php';
 } else {
     require_once $baseDir . '/Mage/Autoload.php';
     $loader = new \Mage\Autoload();

composer.json

@@ -14,8 +14,8 @@
     "autoload": {
         "psr-4": {
             "Mage\\": "./Mage",
-            "Task\\": ".mage/tasks",
-            "Command\\": ".mage/commands"
+            "Task\\": [".mage/tasks", "../../../.mage/tasks"],
+            "Command\\": [".mage/tasks", "../../../.mage/commands"]
         }
     },
     "config": {