Merge remote-tracking branch 'remotes/jellyfin/api-migration' into api-audio

# Conflicts:
#	Emby.Server.Implementations/ApplicationHost.cs
#	Jellyfin.Api/Helpers/TranscodingJobHelper.cs

1 files changed, 2 insertions, 1 deletions

diff --git a/MediaBrowser.Controller/Entities/AggregateFolder.cs b/MediaBrowser.Controller/Entities/AggregateFolder.cs
index 54540e892..e1c800e61 100644
--- a/MediaBrowser.Controller/Entities/AggregateFolder.cs
+++ b/MediaBrowser.Controller/Entities/AggregateFolder.cs
@@ -35,7 +35,7 @@ namespace MediaBrowser.Controller.Entities
         public override bool SupportsPlayedStatus => false;
 
         /// <summary>
-        /// The _virtual children
+        /// The _virtual children.
         /// </summary>
         private readonly ConcurrentBag<BaseItem> _virtualChildren = new ConcurrentBag<BaseItem>();
 
@@ -195,6 +195,7 @@ namespace MediaBrowser.Controller.Entities
                     return child;
                 }
             }
+
             return null;
         }
     }