Merge branch '7.1.5' of https://github.com/umbraco/Umbraco-CMS into 7.1.5

src/Umbraco.Core/Persistence/Factories/MacroFactory.cs

@@ -42,7 +42,7 @@ namespace Umbraco.Core.Persistence.Factories
                 };
 
             if (entity.HasIdentity)
-                dto.Id = short.Parse(entity.Id.ToString(CultureInfo.InvariantCulture));
+                dto.Id = int.Parse(entity.Id.ToString(CultureInfo.InvariantCulture));
 
             return dto;
         }
@@ -69,4 +69,4 @@ namespace Umbraco.Core.Persistence.Factories
             return list;
         }
     }
-}
+}