Conflicts: src/Umbraco.Core/Cache/CacheProviderBase.cs src/Umbraco.Core/Cache/HttpRuntimeCacheProvider.cs src/Umbraco.Core/Cache/NullCacheProvider.cs src/Umbraco.Core/Cache/StaticCacheProvider.cs
in code. Unit tests for CacheHelper, unit tests for umbraco.macro, updates to ObjectExtensions.TryConvertTo + unit tests, enhanced disposable method of ApplicationContext.