Merge "Merge release-5-1 into master"
authorErik Lindahl <erik.lindahl@gmail.com>
Thu, 9 Jul 2015 10:56:19 +0000 (12:56 +0200)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Thu, 9 Jul 2015 10:56:20 +0000 (12:56 +0200)

Trivial merge