Merge release-4-5-patches into release-4-6

Conflicts:
	admin/GerritBuild.bat

Change-Id: Ib62e8f5949cc8e65342cd1826888901d11032474

diff --cc CMakeLists.txt
Simple merge

diff --cc admin/GerritBuild.bat
index 6cd95bb362b14a1c409b534a962ac8926bfe8b0e,ca1186e0ebb332e31f088371587d5acbd8baa078..f603724726900c7a756afc12a570bec5c1791ded
--- 1/admin/GerritBuild.bat
--- 2/admin/GerritBuild.bat
+++ b/admin/GerritBuild.bat
@@@ -3,6 -3,5 +3,4 @@@ REM Run Windows SDK SetEnv scrip
  SetEnv && ^
  cmake -G "Visual Studio 10 Win64" -D GMX_DOUBLE=%GMX_DOUBLE% -D GMX_MPI=%GMX_MPI% -D GMX_OPENMP=%GMX_OPENMP% -DGMX_DEFAULT_SUFFIX=off -DCMAKE_BUILD_TYPE=Debug . && ^
  msbuild All_Build.vcxproj && ^
- REM currently the test one example test doesn't work on Windows
- REM ctest -D ExperimentalTest -V
- 
+ ctest -D ExperimentalTest -C Debug -V
 -

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