Merge remote branch 'origin/release-4-5-patches'

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

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

diff --cc src/tools/gmx_membed.c
Simple merge