Merge remote-tracking branch 'tot-ra/patch-2'

Conflicts:
	src/Composer/Downloader/ArchiveDownloader.php

src/Composer/Downloader/ArchiveDownloader.php

@@ -47,6 +47,9 @@ abstract class ArchiveDownloader extends FileDownloader
             if (1 === count($contentDir)) {
                 $contentDir = $contentDir[0];
 
+                if (is_file($contentDir)) {
+                    $this->filesystem->rename($contentDir, $path . '/' . basename($contentDir));
+                } else {
                     // Rename the content directory to avoid error when moving up
                     // a child folder with the same name
                     $temporaryName = md5(time().rand());
@@ -58,8 +61,10 @@ abstract class ArchiveDownloader extends FileDownloader
                             $this->filesystem->rename($file, $path . '/' . basename($file));
                         }
                     }
+
                     rmdir($contentDir);
                 }
+            }
         } catch (\Exception $e) {
             // clean up
             $this->filesystem->removeDirectory($path);