Merge branch release-2016

Kept a cmake variable description string from release-2016

Change-Id: I2077780afbbe3cc610d699ea498caa6959e4000c

diff --cc cmake/gmxVersionInfo.cmake
index ec96b3b60f6f8d202bef41236ea1e8df7236610b,d8ff6b58d607352370dbfa01252615b81e67f8a0..48fa2b5b67023fe6384ef855c6636d65a93b3b65
--- 1/cmake/gmxVersionInfo.cmake
--- 2/cmake/gmxVersionInfo.cmake
+++ b/cmake/gmxVersionInfo.cmake
@@@ -224,8 -227,8 +224,8 @@@ if (NOT SOURCE_IS_SOURCE_DISTRIBUTION A
  endif()
  
  set(REGRESSIONTEST_VERSION "${GMX_VERSION_STRING}")
 -set(REGRESSIONTEST_BRANCH "refs/heads/release-2016")
 -set(REGRESSIONTEST_MD5SUM "a1625834b5fc8dcde0b8ef40cf64910c" CACHE INTERNAL "MD5 sum of the regressiontests tarball")
 +set(REGRESSIONTEST_BRANCH "refs/heads/master")
- set(REGRESSIONTEST_MD5SUM "366438549270d005fa6def6e56ca0256")
++set(REGRESSIONTEST_MD5SUM "366438549270d005fa6def6e56ca0256" CACHE INTERNAL "MD5 sum of the regressiontests tarball")
  
  math(EXPR GMX_VERSION_NUMERIC
       "${GMX_VERSION_MAJOR}*10000 + ${GMX_VERSION_PATCH}")

diff --cc src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_inner.h
Simple merge