Merge branch 'v2.4' into v2.5

scripts/partial_tempering.sh

 #! /bin/bash
 # vim:ft=awk
 if [ "$1" = --description ] ; then
-  echo "create a new collective variable from a template"
+  echo "scale parameters in a gromacs topology to implement solute or partial tempering"
   exit 0
 fi