Merge remote-tracking branch 'origin/master' into issue/997

# Conflicts:
#	data/assets/scene/solarsystem/planets/mercury/mercury.asset

data/assets/customization/globebrowsing.asset

@@ -58,10 +58,12 @@ asset.onInitialize(function ()
     -- Add local patches described at the top of this file
     for obj, list in pairs(vrt_folders) do
         for _, dir in pairs(list) do
-            openspace.globebrowsing.addBlendingLayersFromDirectory(dir, obj)
+            if (dir ~= '') then
+                openspace.globebrowsing.addBlendingLayersFromDirectory(dir, obj)
 
-            if CreateFocusNodes then
-                openspace.globebrowsing.addFocusNodesFromDirectory(dir, obj)
+                if CreateFocusNodes then
+                    openspace.globebrowsing.addFocusNodesFromDirectory(dir, obj)
+                end
             end
         end
     end

data/assets/scene/digitaluniverse/stars.asset

@@ -58,7 +58,7 @@ local sunstar = {
         MagnitudeExponent = 6.2,
         SizeComposition = "Distance Modulus",
         RenderMethod = "Texture Based", -- or PSF
-        FadeInDistances = {0.0001, 0.1}
+        FadeInDistances = { 0.0001, 0.1 }
     },
     GUI = {
         Name = "Sun",

data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset

@@ -24,6 +24,7 @@ local initializeAndAddNodes = function()
   local iss = {
     Identifier = "ISS",
     Parent = transforms.EarthInertial.Identifier,
+    BoundingSphere = 30,
     Transform = {
       Translation = {
         Type = "TLETranslation",