Merge branch 'master' into fix-hdhomerun

2 files changed, 9 insertions, 3 deletions

diff --git a/MediaBrowser.Model/System/PublicSystemInfo.cs b/MediaBrowser.Model/System/PublicSystemInfo.cs
index d2f7556a5..53030843a 100644
--- a/MediaBrowser.Model/System/PublicSystemInfo.cs
+++ b/MediaBrowser.Model/System/PublicSystemInfo.cs
@@ -43,7 +43,10 @@ namespace MediaBrowser.Model.System
         /// <summary>
         /// Gets or sets a value indicating whether the startup wizard is completed.
         /// </summary>
-        /// <value>The startup completion status.</value>
-        public bool StartupWizardCompleted { get; set; }
+        /// <remarks>
+        /// Nullable for OpenAPI specification only to retain backwards compatibility in apiclients.
+        /// </remarks>
+        /// <value>The startup completion status.</value>]
+        public bool? StartupWizardCompleted { get; set; }
     }
 }
diff --git a/MediaBrowser.Model/System/SystemInfo.cs b/MediaBrowser.Model/System/SystemInfo.cs
index 18ca74ee3..4b83fb7e6 100644
--- a/MediaBrowser.Model/System/SystemInfo.cs
+++ b/MediaBrowser.Model/System/SystemInfo.cs
@@ -14,13 +14,16 @@ namespace MediaBrowser.Model.System
     {
         /// <summary>No path to FFmpeg found.</summary>
         NotFound,
+
         /// <summary>Path supplied via command line using switch --ffmpeg.</summary>
         SetByArgument,
+
         /// <summary>User has supplied path via Transcoding UI page.</summary>
         Custom,
+
         /// <summary>FFmpeg tool found on system $PATH.</summary>
         System
-    };
+    }
 
     /// <summary>
     /// Class SystemInfo.