Gets that naggy unit test passing
Merge remote-tracking branch 'origin/6.2.0' into 7.0.1

Conflicts:
	src/Umbraco.Tests/ObjectExtensionsTests.cs