Merge branch 'release-4-5-patches'

Conflicts:
	src/tools/Makefile.am

diff --cc include/string2.h
Simple merge

diff --cc include/vec.h
Simple merge

diff --cc src/kernel/CMakeLists.txt
Simple merge

diff --cc src/kernel/mdrun.c
Simple merge

diff --cc src/tools/CMakeLists.txt
Simple merge

diff --cc src/tools/Makefile.am
index 7ce8dbc44a866d36da77bf5689d0ee877096dfd1,6c92fb869053c8067844764aa0039a32094cb862..9241a65c96624533618cb5c476eb7505f9887d71
--- 1/src/tools/Makefile.am
--- 2/src/tools/Makefile.am
+++ b/src/tools/Makefile.am
@@@ -64,7 -64,7 +64,7 @@@ bin_PROGRAMS = 
        g_enemat        g_energy        g_lie           g_filter        \
        g_gyrate        g_h2order       g_hbond         g_helix         \
        g_mindist       g_msd           g_morph         g_nmeig         \
-       g_nmens         g_order         g_membed        \
 -      g_nmens         g_order         g_kinetics      \
++      g_nmens         g_order         g_kinetics      g_membed        \
        g_polystat      g_potential     g_rama          \
        g_rdf           g_rms           g_rmsdist       g_rmsf          \
        g_rotacf        g_rotmat        g_saltbr        g_sas           \