Merge branch 'master' into improved_superquadrics

Author: jessdtate

src/Externals/spire/entity-system/GenericSystem.hpp

@@ -37,6 +37,7 @@
 
 #include <es-log/trace-log.h>
 #include <iostream>
+#include <limits>       // std::numeric_limits
 #include <array>
 #include <set>          // Only used in a corner case of walkComponents where
                         // all components are optional.

src/Interface/Modules/Render/Ospray/OSPRayDataManager.cpp

@@ -28,6 +28,7 @@
 #include "OSPRayDataManager.h"
 
 #include <cstring>
+#include <stdio.h>
 
 using namespace SCIRun::Render;