Merge "Merge branch release-2016"
authorGerrit Code Review <gerrit@gerrit.gromacs.org>
Sat, 18 Mar 2017 13:07:10 +0000 (14:07 +0100)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Sat, 18 Mar 2017 13:07:10 +0000 (14:07 +0100)

Trivial merge