Merge branch 'release-5-0' into release-5-1

 Conflicts:
	src/gromacs/mdlib/coupling.cpp

Trivial conflict from removing unused variables in release-5-1, but
adding one in release-5-0, resolved by combining both logical changes.

Change-Id: Ib3e762bec8699465d47cbc364fecb424b23aec11

diff --cc src/gromacs/mdlib/coupling.cpp
index d0169dcdc28d4af97d65db9e4a2e5d454520ac33,9d0ee0886caefbd3d7b388f26eb5faaa38e7909c..d5244e7134e431ec07ff984a7664fd6abc6eb087
--- 1/src/gromacs/mdlib/coupling.cpp
--- 2/src/gromacs/mdlib/coupling.c
+++ b/src/gromacs/mdlib/coupling.cpp
@@@ -836,7 -822,7 +836,7 @@@ void trotter_update(t_inputrec *ir, gmx
                      t_extmass *MassQ, int **trotter_seqlist, int trotter_seqno)
  {
  
-     int             n, i, d, ngtc, gc = 0;
 -    int             n, i, j, d, ntgrp, ngtc, gc = 0, t;
++    int             n, i, d, ngtc, gc = 0, t;
      t_grp_tcstat   *tcstat;
      t_grpopts      *opts;
      gmx_int64_t     step_eff;

diff --cc src/gromacs/mdlib/forcerec.cpp
Simple merge