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

4 files changed, 12 insertions, 8 deletions

diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index f862ce61b5..eefce2fd34 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -538,8 +538,12 @@ namespace MediaBrowser.Controller.Entities
             var validChildren = new ConcurrentBag<Tuple<BaseItem, bool>>();
 
             cancellationToken.ThrowIfCancellationRequested();
-            
-            Parallel.ForEach(nonCachedChildren, child =>
+
+            var options = new ParallelOptions
+            {
+            };
+
+            Parallel.ForEach(nonCachedChildren, options, child =>
             {
                 BaseItem currentChild;
 
diff --git a/MediaBrowser.Controller/Providers/MediaInfo/FFProbeAudioInfoProvider.cs b/MediaBrowser.Controller/Providers/MediaInfo/FFProbeAudioInfoProvider.cs
index 479a2b1afb..542b8eed85 100644
--- a/MediaBrowser.Controller/Providers/MediaInfo/FFProbeAudioInfoProvider.cs
+++ b/MediaBrowser.Controller/Providers/MediaInfo/FFProbeAudioInfoProvider.cs
@@ -139,7 +139,7 @@ namespace MediaBrowser.Controller.Providers.MediaInfo
             // If we don't have a ProductionYear try and get it from PremiereDate
             if (audio.PremiereDate.HasValue && !audio.ProductionYear.HasValue)
             {
-                audio.ProductionYear = audio.PremiereDate.Value.Year;
+                audio.ProductionYear = audio.PremiereDate.Value.ToLocalTime().Year;
             }
 
             FetchGenres(audio, tags);
diff --git a/MediaBrowser.Controller/Providers/Movies/MovieDbProvider.cs b/MediaBrowser.Controller/Providers/Movies/MovieDbProvider.cs
index 00d604d8db..fb8370248c 100644
--- a/MediaBrowser.Controller/Providers/Movies/MovieDbProvider.cs
+++ b/MediaBrowser.Controller/Providers/Movies/MovieDbProvider.cs
@@ -927,19 +927,19 @@ namespace MediaBrowser.Controller.Providers.Movies
                     movie.OfficialRating = ourRelease.certification ?? usRelease.certification;
                     if (ourRelease.release_date > new DateTime(1900, 1, 1))
                     {
-                        movie.PremiereDate = ourRelease.release_date;
+                        movie.PremiereDate = ourRelease.release_date.ToUniversalTime();
                         movie.ProductionYear = ourRelease.release_date.Year;
                     }
                     else
                     {
-                        movie.PremiereDate = usRelease.release_date;
+                        movie.PremiereDate = usRelease.release_date.ToUniversalTime();
                         movie.ProductionYear = usRelease.release_date.Year;
                     }
                 }
                 else
                 {
                     //no specific country release info at all
-                    movie.PremiereDate = movieData.release_date;
+                    movie.PremiereDate = movieData.release_date.ToUniversalTime();
                     movie.ProductionYear = movieData.release_date.Year;
                 }
 
diff --git a/MediaBrowser.Controller/Providers/Movies/TmdbPersonProvider.cs b/MediaBrowser.Controller/Providers/Movies/TmdbPersonProvider.cs
index 49823b9b6e..699c5473b4 100644
--- a/MediaBrowser.Controller/Providers/Movies/TmdbPersonProvider.cs
+++ b/MediaBrowser.Controller/Providers/Movies/TmdbPersonProvider.cs
@@ -231,12 +231,12 @@ namespace MediaBrowser.Controller.Providers.Movies
 
             if (DateTime.TryParseExact(searchResult.Birthday, "yyyy-MM-dd", new CultureInfo("en-US"), DateTimeStyles.None, out date))
             {
-                person.PremiereDate = date;
+                person.PremiereDate = date.ToUniversalTime();
             }
 
             if (DateTime.TryParseExact(searchResult.Deathday, "yyyy-MM-dd", new CultureInfo("en-US"), DateTimeStyles.None, out date))
             {
-                person.EndDate = date;
+                person.EndDate = date.ToUniversalTime();
             }
 
             if (!string.IsNullOrEmpty(searchResult.Homepage))