Merge branch 'v2.3' into v2.4

CHANGES/v2.3.md

@@ -248,3 +248,8 @@ For developers:
 - Install newer ccache on travis-ci, build faster.
 - Small fix in provided env modules (`PLUMED_VIMPATH` is set also when shared libraries are disabled).
 
+## Version 2.3.7 (to be released)
+
+For users:
+- Fixed flag DETAILED_TIMERS in \ref DEBUG (flag was ignored and detailed timers always written).
+

src/generic/Debug.cpp

@@ -89,8 +89,10 @@ Debug::Debug(const ActionOptions&ao):
   if(novirial) log.printf("  Switching off virial contribution\n");
   if(novirial) plumed.novirial=true;
   parseFlag("DETAILED_TIMERS",detailedTimers);
-  if(detailedTimers) log.printf("  Detailed timing on\n");
-  plumed.detailedTimers=true;
+  if(detailedTimers) {
+    log.printf("  Detailed timing on\n");
+    plumed.detailedTimers=true;
+  }
   ofile.link(*this);
   std::string file;
   parse("FILE",file);