Merge branch 'master' into test

app/Models/Artist.php

@@ -126,16 +126,6 @@ class Artist extends Model
         return $info;
     }
 
-    /**
-     * Get songs *contributed* (in compilation albums) by the artist.
-     *
-     * @return \Illuminate\Database\Eloquent\Collection
-     */
-    public function getContributedSongs()
-    {
-        return Song::whereContributingArtistId($this->id)->get();
-    }
-
     /**
      * Turn the image name into its absolute URL.
      *

app/Services/Download.php

@@ -118,9 +118,6 @@ class Download
 
     protected function fromArtist(Artist $artist)
     {
-        // Don't forget the contributed songs.
+        return $this->fromMultipleSongs($artist->songs);
-        $songs = $artist->songs->merge($artist->getContributedSongs());
-
-        return $this->fromMultipleSongs($songs);
     }
 }