Merge branch 'release-4-5-patches' of git.gromacs.org:gromacs into release-4-5-patches