Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

MediaBrowser.Api/UserLibrary/ArtistsService.cs

@@ -111,6 +111,7 @@ namespace MediaBrowser.Api.UserLibrary
         {
             return items
                 .OfType<IHasArtist>()
+                .Where(i => !(i is MusicAlbum))
                 .SelectMany(i => i.AllArtists)
                 .Distinct(StringComparer.OrdinalIgnoreCase)
                 .Select(name =>

MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs

@@ -31,6 +31,23 @@ namespace MediaBrowser.Controller.Entities.Audio
             }
         }
 
+        [IgnoreDataMember]
+        public List<string> AllArtists
+        {
+            get
+            {
+                var list = new List<string>();
+
+                if (!string.IsNullOrEmpty(AlbumArtist))
+                {
+                    list.Add(AlbumArtist);
+                }
+                list.AddRange(Artists);
+
+                return list;
+            }
+        }
+
         /// <summary>
         /// Gets or sets the tags.
         /// </summary>