Merge branch 'release-4-5-patches' into rotation-4-5

diff --cc src/gmxlib/names.c
Simple merge

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

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

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

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

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

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

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