Merge remote-tracking branch 'refs/remotes/galli-leo/develop' into develop

src/NzbDrone.Core/Datastore/Migration/004_updated_history.cs

@@ -17,8 +17,7 @@ namespace NzbDrone.Core.Datastore.Migration
                   .WithColumn("SourceTitle").AsString()
                   .WithColumn("Date").AsDateTime()
                   .WithColumn("Quality").AsString()
-                  .WithColumn("Data").AsString()
-                  .WithColumn("MovieId").AsInt32().WithDefaultValue(0);
+                  .WithColumn("Data").AsString();
         }
     }
 }

src/NzbDrone.Core/Datastore/Migration/105_fix_history_movieId.cs

@@ -0,0 +1,15 @@
+using FluentMigrator;
+using NzbDrone.Core.Datastore.Migration.Framework;
+
+namespace NzbDrone.Core.Datastore.Migration
+{
+    [Migration(105)]
+    public class fix_history_movieId : NzbDroneMigrationBase
+    {
+        protected override void MainDbUpgrade()
+        {
+            Alter.Table("History")
+                  .AddColumn("MovieId").AsInt32().WithDefaultValue(0);
+        }
+    }
+}