Merge remote-tracking branch 'origin/v2.3' into v2.3

[makedoc]

Conflicts:
	CHANGES/v2.3.txt

CHANGES/v2.3.txt

@@ -137,7 +137,6 @@ Version 2.3.1 (Mar 31, 2017)
 - fixed `plumed-config` that was not working.
 - log file points to the `config.txt` files to allow users to check which features were available in that compiled version.
 - `make clean` in root dir now also cleans `vim` subdirectory.
-- Resolved problem with nan in SMAC with SPECIESA and SPECIESB involving molecules that are the same
 - Updated gromacs patch to version 2016.3 
 
 For developers:
@@ -150,6 +149,7 @@ See branch \branch{v2.3} on git repository.
 
 - New flag `--disable-libsearch` for `configure`, allowing an easier control of linked libraries when installing PLUMED
   with a package manager such as MacPorts.
+- Resolved problem with nan in SMAC with SPECIESA and SPECIESB involving molecules that are the same.
 - PDB reader is now able to read files with dos newlines (see \issue{223}).