Merge branch 'v2.4' of https://github.com/plumed/plumed2 into v2.4

src/analysis/Histogram.cpp

@@ -212,6 +212,7 @@ public:
   void prepareForAveraging();
   void performOperations( const bool& from_update );
   void finishAveraging();
+  bool threadSafe() const { return !in_apply; }
   bool isPeriodic() { return false; }
   unsigned getNumberOfDerivatives();
   void turnOnDerivatives();