Merge remote-tracking branch 'origin/6.2.0' into 7.0.0

Conflicts:
	src/Umbraco.Core/Services/PackagingService.cs
	src/Umbraco.Web/Mvc/UmbracoViewPage.cs
	src/Umbraco.Web/Umbraco.Web.csproj

src/Umbraco.Core/TypeExtensions.cs

@@ -278,6 +278,11 @@ namespace Umbraco.Core
             return typeof (TBase).IsAssignableFrom(type);
         }
 
+	    public static bool Inherits(this Type type, Type tbase)
+	    {
+	        return tbase.IsAssignableFrom(type);
+	    }
+
         public static bool Implements<TInterface>(this Type type)
         {
             return typeof (TInterface).IsAssignableFrom(type);