Merge "Merge branch release-5-1"
authorTeemu Murtola <teemu.murtola@gmail.com>
Wed, 4 Nov 2015 20:00:51 +0000 (21:00 +0100)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Wed, 4 Nov 2015 20:00:51 +0000 (21:00 +0100)

Trivial merge