Merge remote-tracking branch 'origin/v7/dev' into v8/dev
# Conflicts: # src/Umbraco.Core/Cache/WebCachingAppCache.cs # src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs # src/Umbraco.Web.UI.Client/bower.json # src/umbraco.businesslogic/umbraco.businesslogic.csproj
This commit is contained in: