Merge branch release-2018 into release-2019

Final merge before release of 2019.

Change-Id: I19963b7248095b2f9b6f6425e756218eb82afb93

diff --git a/docs/release-notes/2018/2018.5.rst b/docs/release-notes/2018/2018.5.rst
index b73325f74bad4f4b5bbc9b5008c442431fe4389a..61573df4dd3bf66cdfa03f178ea1afd3629969e5 100644 (file)
--- a/docs/release-notes/2018/2018.5.rst
+++ b/docs/release-notes/2018/2018.5.rst
@@ -38,6 +38,14 @@ cause a slight loss of accuracy in inhomogeneous systems.
 
 :issue: `2808`
 
+Fix acceleration with ``cos-acceleration``
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+A factor of 2 was missing from the acceleration value, leading to incorrect
+results when e.g. calculating viscosities.
+
+:issue: `2572`
+
 Fixes for ``gmx`` tools
 ^^^^^^^^^^^^^^^^^^^^^^^