Merge release-2018 into master

Change-Id: I197f817d0b54392bc1198536e39e74baacad3e96

diff --cc cmake/gmxCPackUtilities.cmake
index 7867998a8a68c61587fbbc023adfee54e7baa9a4,0388254c83a4b83477058f2b72b9def6dab12cfa..5a5c267c41a8623e2b8b6ee7978372b4e47955b7
--- 1/cmake/gmxCPackUtilities.cmake
--- 2/cmake/gmxCPackUtilities.cmake
+++ b/cmake/gmxCPackUtilities.cmake
@@@ -1,7 -1,7 +1,7 @@@
  #
  # This file is part of the GROMACS molecular simulation package.
  #
- # Copyright (c) 2014,2015,2016, by the GROMACS development team, led by
 -# Copyright (c) 2014,2015,2016,2017, by the GROMACS development team, led by
++# Copyright (c) 2014,2015,2016,2017,2018, 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 src/programs/mdrun/runner.cpp
Simple merge