Merge branch 'master' into 1.1

# Conflicts:
#	Source/Engine/Content/JsonAsset.h
#	Source/Engine/Core/Config/Settings.h

Source/Engine/Terrain/Terrain.cpp

@@ -36,6 +36,7 @@ Terrain::~Terrain()
 
 void Terrain::UpdateBounds()
 {
+    PROFILE_CPU();
     _box = BoundingBox(_transform.Translation, _transform.Translation);
     for (int32 i = 0; i < _patches.Count(); i++)
     {
@@ -48,6 +49,7 @@ void Terrain::UpdateBounds()
 
 void Terrain::CacheNeighbors()
 {
+    PROFILE_CPU();
     for (int32 pathIndex = 0; pathIndex < _patches.Count(); pathIndex++)
     {
         const auto patch = _patches[pathIndex];