Merge remote-tracking branch 'origin/v2.5' into v2.5-fix-h36

regtest/basic/rt-maxent-5/forces.2.reference

regtest/basic/rt-maxent-5/forces.3.reference

regtest/basic/rt-maxent-5/forces.4.reference

regtest/basic/rt-maxent-5/forces.5.reference

regtest/basic/rt-maxent-5/plumed.0.dat

regtest/basic/rt-maxent-5/plumed.1.dat

regtest/basic/rt-maxent-5/plumed.2.dat

scripts/partial_tempering.sh

src/adjmat/ClusterDiameter.cpp

src/adjmat/ClusterDistribution.cpp

src/adjmat/ClusterSize.cpp

src/adjmat/ContactMatrix.cpp

src/adjmat/HbondMatrix.cpp

src/adjmat/MatrixRowSums.cpp

src/adjmat/SMACMatrix.cpp

src/analysis/AnalysisBase.h

src/analysis/Average.cpp

src/analysis/EuclideanDissimilarityMatrix.cpp

src/analysis/FarthestPointSampling.cpp

src/analysis/Histogram.cpp