Merge "Merge branch release-5-1 into release-2016" into release-2016
authorGerrit Code Review <gerrit@gerrit.gromacs.org>
Tue, 28 Feb 2017 13:13:33 +0000 (14:13 +0100)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Tue, 28 Feb 2017 13:13:33 +0000 (14:13 +0100)

Trivial merge