Merge branch 'patch-1' of https://github.com/aaronpowell/Umbraco-CMS into aaronpowell-patch-1

src/Umbraco.Core/Services/PackagingService.cs

@@ -1198,6 +1198,10 @@ namespace Umbraco.Core.Services
 
             foreach (var macro in macros)
             {
+                var existing = _macroService.GetByAlias(macro.Alias);
+                if (existing != null)
+                    macro.Id = existing.Id;
+
                 _macroService.Save(macro, userId);
             }
 
@@ -1822,4 +1826,4 @@ namespace Umbraco.Core.Services
         public static event TypedEventHandler<IPackagingService, ExportEventArgs<ITemplate>> ExportedTemplate;
         #endregion
     }
-}
+}