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, 9 insertions, 2 deletions

diff --git a/MediaBrowser.Model/Search/SearchQuery.cs b/MediaBrowser.Model/Search/SearchQuery.cs
index 4470f1ad9..01ad319a4 100644
--- a/MediaBrowser.Model/Search/SearchQuery.cs
+++ b/MediaBrowser.Model/Search/SearchQuery.cs
@@ -8,7 +8,7 @@ namespace MediaBrowser.Model.Search
     public class SearchQuery
     {
         /// <summary>
-        /// The user to localize search results for
+        /// The user to localize search results for.
         /// </summary>
         /// <value>The user id.</value>
         public Guid UserId { get; set; }
@@ -26,20 +26,27 @@ namespace MediaBrowser.Model.Search
         public int? StartIndex { get; set; }
 
         /// <summary>
-        /// The maximum number of items to return
+        /// The maximum number of items to return.
         /// </summary>
         /// <value>The limit.</value>
         public int? Limit { get; set; }
 
         public bool IncludePeople { get; set; }
+
         public bool IncludeMedia { get; set; }
+
         public bool IncludeGenres { get; set; }
+
         public bool IncludeStudios { get; set; }
+
         public bool IncludeArtists { get; set; }
 
         public string[] MediaTypes { get; set; }
+
         public string[] IncludeItemTypes { get; set; }
+
         public string[] ExcludeItemTypes { get; set; }
+
         public string ParentId { get; set; }
 
         public bool? IsMovie { get; set; }