Merge branch 'master' into feature/memory-allocations

# Conflicts:
#	include/openspace/scene/scenegraphnode.h
#	modules/imgui/include/gui.h

modules/globebrowsing/src/renderableglobe.cpp

@@ -34,8 +34,6 @@
 #include <openspace/documentation/documentation.h>
 #include <openspace/documentation/verifier.h>
 #include <openspace/engine/globals.h>
-#include <openspace/performance/performancemanager.h>
-#include <openspace/performance/performancemeasurement.h>
 #include <openspace/rendering/renderengine.h>
 #include <openspace/scene/scenegraphnode.h>
 #include <openspace/scene/scene.h>

modules/globebrowsing/src/shadowcomponent.cpp

@@ -350,7 +350,6 @@ RenderData ShadowComponent::begin(const RenderData& data) {
     RenderData lightRenderData{
         *_lightCamera,
         data.time,
-        data.doPerformanceMeasurement,
         data.renderBinMask,
         data.modelTransform
     };