Merge remote-tracking branch 'origin/master' into misc/cleanup

# Conflicts:
#	data/scene/default.scene
#	modules/globebrowsing/globes/pointglobe.cpp
#	modules/globebrowsing/tile/rawtiledatareader/tiledatatype.cpp

modules/globebrowsing/cache/texturecontainer.h

@@ -68,8 +68,9 @@ public:
 
 private:
     std::vector<std::unique_ptr<ghoul::opengl::Texture>> _textures;
-    size_t _freeTexture;
+
     const TileTextureInitData _initData;
+    size_t _freeTexture;
     size_t _numTextures;
 };