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

Conflicts:
	cmake/gmxTestLargeFiles.cmake

Change-Id: I104448f48be0c7b3cd5daa1b5cede3cb9d7f672d

diff --cc CMakeLists.txt
index 98d5a1aaaf2c4f26dd02b0f7cb7bfc92fe8a819b,e1c698d21cf333ad42ede5af460d5e365d40f65e..625485af26a83cd3e99279f55a2f818fe39025c3
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -661,9 -526,9 +661,8 @@@ gmx_test_float_format(GMX_FLOAT_FORMAT_
  
  include(gmxTestLargeFiles)
  gmx_test_large_files(GMX_LARGEFILES)
- check_function_exists(fseeko     HAVE_FSEEKO)
  
  include(gmxTestSignal)
 -gmx_test_retsigtype(RETSIGTYPE)
  gmx_test_sigusr1(HAVE_SIGUSR1)
  
  include(gmxTestInline)

diff --cc cmake/gmxTestLargeFiles.cmake
Simple merge

diff --cc include/xdrf.h
Simple merge

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

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

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