Merge release-5-0 into release-5-1

Change-Id: I12e0bd25b9b114d0977401e8032078d7cfdd78cf

diff --cc src/gromacs/mdlib/nbnxn_search.c
Simple merge

diff --cc src/gromacs/mdlib/stat.cpp
index 97cd398615a0ba7eaeefbbda9113091d7a86513f,31bfe06b43883b946a82a0278fae9e0f5394383d..8e3e368159d848692df5fce147fb4031b28f62e8
--- 1/src/gromacs/mdlib/stat.cpp
--- 2/src/gromacs/mdlib/stat.c
+++ b/src/gromacs/mdlib/stat.cpp
@@@ -3,7 -3,7 +3,7 @@@
   *
   * Copyright (c) 1991-2000, University of Groningen, The Netherlands.
   * Copyright (c) 2001-2004, The GROMACS development team.
-  * Copyright (c) 2013,2014,2015, by the GROMACS development team, led by
 - * Copyright (c) 2013,2014,2016, by the GROMACS development team, led by
++ * Copyright (c) 2013,2014,2015,2016, 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.