Merge branch release-2020

Change-Id: I72d135ce8e774d1ff70b66d86cac22eed864425e

diff --cc docs/CMakeLists.txt
Simple merge

diff --cc docs/release-notes/index.rst
Simple merge

diff --cc src/gromacs/domdec/domdec_topology.cpp
index ee5da3d11a959d56c82bb5cdca46c7a8b1a13821,6e28cad22c6e52fd7adcfc8c8eaf08dd5383f02b..19acbac64bbf6025c254d2c4fba57c9891312fb8
--- 1/src/gromacs/domdec/domdec_topology.cpp
--- 2/src/gromacs/domdec/domdec_topology.cpp
+++ b/src/gromacs/domdec/domdec_topology.cpp
@@@ -1931,10 -1931,10 +1931,10 @@@ t_blocka* makeBondedLinks(const gmx_mto
                      i += nral_rt(ftype);
                  }
  
 -                if (mtop->bIntermolecularInteractions)
 +                if (mtop.bIntermolecularInteractions)
                  {
-                     int i = ril_intermol.index[a];
-                     while (i < ril_intermol.index[a + 1])
+                     int i = ril_intermol.index[cg_gl];
+                     while (i < ril_intermol.index[cg_gl + 1])
                      {
                          int ftype = ril_intermol.il[i++];
                          int nral  = NRAL(ftype);

diff --cc src/gromacs/domdec/partition.cpp
Simple merge

diff --cc src/gromacs/mdrun/md.cpp
Simple merge

diff --cc src/gromacs/mdrun/runner.cpp
Simple merge