Merge release-2019 into master

Change-Id: I17cea87b19b5350853fdf652539a2f43e6092784

diff --cc cmake/gmxManageLmfit.cmake
index 1217cb9b41719eb5f06fc5f5a1e4e0a7c53e6187,1152d0b8edec368db8ad4a37f8d8eaf62f1fc0e0..1656feb3c2ceb32308b67114bbeb2a286f4df464
--- 1/cmake/gmxManageLmfit.cmake
--- 2/cmake/gmxManageLmfit.cmake
+++ b/cmake/gmxManageLmfit.cmake
@@@ -1,7 -1,7 +1,7 @@@
  #
  # This file is part of the GROMACS molecular simulation package.
  #
--# Copyright (c) 2016,2018, by the GROMACS development team, led by
++# Copyright (c) 2016,2018,2019, by the GROMACS development team, led by
  # Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  # and including many others, as listed in the AUTHORS file in the
  # top-level source directory and at http://www.gromacs.org.

diff --cc cmake/gmxVersionInfo.cmake
Simple merge

diff --cc docs/CMakeLists.txt
Simple merge

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

diff --cc src/gromacs/CMakeLists.txt
Simple merge

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

diff --cc src/gromacs/gpu_utils/gpu_utils_ocl.cpp
Simple merge