Merge branch 'master' into event-rewrite-1

# Conflicts:
#	Emby.Dlna/Emby.Dlna.csproj
#	Emby.Dlna/Eventing/DlnaEventManager.cs
#	Emby.Dlna/Service/BaseService.cs
#	Emby.Server.Implementations/ScheduledTasks/ScheduledTaskWorker.cs
#	MediaBrowser.Controller/Subtitles/SubtitleDownloadEventArgs.cs

MediaBrowser.Controller/Providers/AlbumInfo.cs

@@ -1,3 +1,5 @@
+#pragma warning disable CS1591
+
 using System;
 using System.Collections.Generic;
 

MediaBrowser.Controller/Providers/ArtistInfo.cs

@@ -1,3 +1,5 @@
+#pragma warning disable CS1591
+
 using System.Collections.Generic;
 
 namespace MediaBrowser.Controller.Providers

MediaBrowser.Controller/Providers/BookInfo.cs

@@ -1,3 +1,5 @@
+#pragma warning disable CS1591
+
 namespace MediaBrowser.Controller.Providers
 {
     public class BookInfo : ItemLookupInfo

MediaBrowser.Controller/Providers/BoxSetInfo.cs

@@ -1,3 +1,5 @@
+#pragma warning disable CS1591
+
 namespace MediaBrowser.Controller.Providers
 {
     public class BoxSetInfo : ItemLookupInfo

MediaBrowser.Controller/Providers/DirectoryService.cs

@@ -1,3 +1,5 @@
+#pragma warning disable CS1591
+
 using System;
 using System.Collections.Generic;
 using System.Linq;

MediaBrowser.Controller/Providers/DynamicImageResponse.cs

@@ -1,3 +1,5 @@
+#pragma warning disable CS1591
+
 using System;
 using System.IO;
 using MediaBrowser.Model.Drawing;

MediaBrowser.Controller/Providers/EpisodeInfo.cs

@@ -1,3 +1,5 @@
+#pragma warning disable CS1591
+
 using System;
 using System.Collections.Generic;
 

MediaBrowser.Controller/Providers/ICustomMetadataProvider.cs

@@ -1,3 +1,5 @@
+#pragma warning disable CS1591
+
 using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Controller.Entities;

MediaBrowser.Controller/Providers/IDirectoryService.cs

@@ -1,3 +1,5 @@
+#pragma warning disable CS1591
+
 using System.Collections.Generic;
 using MediaBrowser.Model.IO;
 

MediaBrowser.Controller/Providers/IDynamicImageProvider.cs

@@ -1,3 +1,5 @@
+#pragma warning disable CS1591
+
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;

MediaBrowser.Controller/Providers/IHasItemChangeMonitor.cs

@@ -1,3 +1,5 @@
+#pragma warning disable CS1591
+
 using MediaBrowser.Controller.Entities;
 
 namespace MediaBrowser.Controller.Providers

MediaBrowser.Controller/Providers/IHasLookupInfo.cs

@@ -1,3 +1,5 @@
+#pragma warning disable CS1591
+
 namespace MediaBrowser.Controller.Providers
 {
     public interface IHasLookupInfo<out TLookupInfoType>

MediaBrowser.Controller/Providers/IHasOrder.cs

@@ -1,3 +1,5 @@
+#pragma warning disable CS1591
+
 namespace MediaBrowser.Controller.Providers
 {
     public interface IHasOrder

MediaBrowser.Controller/Providers/ILocalImageProvider.cs

@@ -1,3 +1,5 @@
+#pragma warning disable CS1591
+
 using System.Collections.Generic;
 using MediaBrowser.Controller.Entities;
 

MediaBrowser.Controller/Providers/ILocalMetadataProvider.cs

@@ -1,3 +1,5 @@
+#pragma warning disable CS1591
+
 using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Controller.Entities;

MediaBrowser.Controller/Providers/IMetadataProvider.cs

@@ -1,3 +1,5 @@
+#pragma warning disable CS1591
+
 using MediaBrowser.Controller.Entities;
 
 namespace MediaBrowser.Controller.Providers

MediaBrowser.Controller/Providers/IMetadataService.cs

@@ -1,3 +1,5 @@
+#pragma warning disable CS1591
+
 using System;
 using System.Threading;
 using System.Threading.Tasks;

MediaBrowser.Controller/Providers/IPreRefreshProvider.cs

@@ -1,3 +1,5 @@
+#pragma warning disable CS1591
+
 namespace MediaBrowser.Controller.Providers
 {
     public interface IPreRefreshProvider : ICustomMetadataProvider

MediaBrowser.Controller/Providers/IProviderManager.cs

@@ -1,3 +1,5 @@
+#pragma warning disable CS1591
+
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -72,7 +74,7 @@ namespace MediaBrowser.Controller.Providers
         /// <returns>Task.</returns>
         Task SaveImage(BaseItem item, string source, string mimeType, ImageType type, int? imageIndex, bool? saveLocallyWithMedia, CancellationToken cancellationToken);
 
-        Task SaveImage(User user, Stream source, string mimeType, string path);
+        Task SaveImage(Stream source, string mimeType, string path);
 
         /// <summary>
         /// Adds the metadata providers.

MediaBrowser.Controller/Providers/IRemoteMetadataProvider.cs

@@ -1,3 +1,5 @@
+#pragma warning disable CS1591
+
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;

MediaBrowser.Controller/Providers/IRemoteSearchProvider.cs

@@ -1,3 +1,5 @@
+#pragma warning disable CS1591
+
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;

MediaBrowser.Controller/Providers/ImageRefreshOptions.cs

@@ -1,3 +1,5 @@
+#pragma warning disable CS1591
+
 using System;
 using System.Linq;
 using MediaBrowser.Model.Entities;

MediaBrowser.Controller/Providers/ItemInfo.cs

@@ -1,3 +1,5 @@
+#pragma warning disable CS1591
+
 using System;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Model.Entities;

MediaBrowser.Controller/Providers/ItemLookupInfo.cs

@@ -1,3 +1,5 @@
+#pragma warning disable CS1591
+
 using System;
 using System.Collections.Generic;
 using MediaBrowser.Model.Entities;

MediaBrowser.Controller/Providers/LocalImageInfo.cs

@@ -1,3 +1,5 @@
+#pragma warning disable CS1591
+
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.IO;
 

MediaBrowser.Controller/Providers/MetadataRefreshMode.cs

@@ -1,3 +1,5 @@
+#pragma warning disable CS1591
+
 namespace MediaBrowser.Controller.Providers
 {
     public enum MetadataRefreshMode

MediaBrowser.Controller/Providers/MetadataRefreshOptions.cs

@@ -1,3 +1,5 @@
+#pragma warning disable CS1591
+
 using System;
 using System.Linq;
 using MediaBrowser.Controller.Entities;

MediaBrowser.Controller/Providers/MetadataResult.cs

@@ -1,3 +1,5 @@
+#pragma warning disable CS1591
+
 using System;
 using System.Collections.Generic;
 using System.Globalization;

MediaBrowser.Controller/Providers/MovieInfo.cs

@@ -1,3 +1,5 @@
+#pragma warning disable CS1591
+
 namespace MediaBrowser.Controller.Providers
 {
     public class MovieInfo : ItemLookupInfo

MediaBrowser.Controller/Providers/MusicVideoInfo.cs

@@ -1,3 +1,5 @@
+#pragma warning disable CS1591
+
 using System.Collections.Generic;
 
 namespace MediaBrowser.Controller.Providers

MediaBrowser.Controller/Providers/PersonLookupInfo.cs

@@ -1,3 +1,5 @@
+#pragma warning disable CS1591
+
 namespace MediaBrowser.Controller.Providers
 {
     public class PersonLookupInfo : ItemLookupInfo

MediaBrowser.Controller/Providers/RemoteSearchQuery.cs

@@ -1,3 +1,5 @@
+#pragma warning disable CS1591
+
 using System;
 
 namespace MediaBrowser.Controller.Providers

MediaBrowser.Controller/Providers/SeasonInfo.cs

@@ -1,3 +1,5 @@
+#pragma warning disable CS1591
+
 using System;
 using System.Collections.Generic;
 

MediaBrowser.Controller/Providers/SeriesInfo.cs

@@ -1,3 +1,5 @@
+#pragma warning disable CS1591
+
 namespace MediaBrowser.Controller.Providers
 {
     public class SeriesInfo : ItemLookupInfo

MediaBrowser.Controller/Providers/SongInfo.cs

@@ -1,3 +1,5 @@
+#pragma warning disable CS1591
+
 using System;
 using System.Collections.Generic;
 

MediaBrowser.Controller/Providers/TrailerInfo.cs

@@ -1,3 +1,5 @@
+#pragma warning disable CS1591
+
 namespace MediaBrowser.Controller.Providers
 {
     public class TrailerInfo : ItemLookupInfo