Merge branch 'release-4-5-patches'

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

diff --cc src/mdlib/ns.c
Simple merge

diff --cc src/tools/Makefile.am
index dd2644fa3f80c37f719f53ecd3ad1ea057e7df25,7aca3607601a4bcd426a27dce20ff849d775caae..aa5cc3445e0762411ddb06a80e8569c8c9c710a6
--- 1/src/tools/Makefile.am
--- 2/src/tools/Makefile.am
+++ b/src/tools/Makefile.am
@@@ -70,9 -70,9 +70,9 @@@ bin_PROGRAMS = 
        g_rotacf        g_rotmat        g_saltbr        g_sas           \
        g_select        g_sgangle       \
        g_sham          g_sorient       g_spol          \
-       g_sdf           g_spatial       g_pme_error     \
+       g_spatial       g_pme_error     \
        g_tcaf          g_traj          g_tune_pme   \
 -      g_vanhove       g_velacc        g_membed      \
 +      g_vanhove       g_velacc        \
        g_clustsize     g_mdmat         g_wham          \
        g_sigeps