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

Conflicts:
	MediaBrowser.ServerApplication/ApplicationHost.cs

1 files changed, 10 insertions, 1 deletions

diff --git a/MediaBrowser.Model/Updates/CheckForUpdateResult.cs b/MediaBrowser.Model/Updates/CheckForUpdateResult.cs
index 48c0b398c..c9bc2d6b9 100644
--- a/MediaBrowser.Model/Updates/CheckForUpdateResult.cs
+++ b/MediaBrowser.Model/Updates/CheckForUpdateResult.cs
@@ -17,6 +17,15 @@ namespace MediaBrowser.Model.Updates
         /// Gets or sets the available version.
         /// </summary>
         /// <value>The available version.</value>
-        public Version AvailableVersion { get; set; }
+        public Version AvailableVersion
+        {
+            get { return Package != null ? Package.version : new Version(0, 0); }
+            set { } // need this for the serializer
+        }
+
+        /// <summary>
+        /// Get or sets package information for an available update
+        /// </summary>
+        public PackageVersionInfo Package { get; set; }
     }
 }