Merge remote-tracking branch 'gerrit/release-4-5-patches' into release-4-6

Conflicts:
	admin/GerritBuild.bat

Change-Id: Ie04e9e5932aa2a154712a17efb03538648b4b817

diff --cc admin/GerritBuild.bat
index 1200e0ad83dbbdbb71854e26f2d157da9ed6463f,b942174b8939f990376eafefa3d23ddb7b4596db..b520413e35d2550517f53659f5d0610a464c6390
--- 1/admin/GerritBuild.bat
--- 2/admin/GerritBuild.bat
+++ b/admin/GerritBuild.bat
@@@ -1,3 -1,3 +1,3 @@@
  mkdir releng
  cd releng
- git init && git fetch ssh://jenkins@gerrit.gromacs.org:29418/releng refs/heads/4.6.0 && git checkout -q -f FETCH_HEAD && cd .. && python -u releng/GerritBuild.py
 -git init && git fetch git://git.gromacs.org/releng.git refs/heads/4.5.0 && git checkout -q -f FETCH_HEAD && cd .. && python -u releng/GerritBuild.py
++git init && git fetch git://git.gromacs.org/releng.git refs/heads/4.6.0 && git checkout -q -f FETCH_HEAD && cd .. && python -u releng/GerritBuild.py

diff --cc include/maths.h
Simple merge

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