Merge "Merge release-4-6 into release-5-0" into release-5-0
authorMark Abraham <mark.j.abraham@gmail.com>
Mon, 15 Dec 2014 17:57:47 +0000 (18:57 +0100)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Mon, 15 Dec 2014 17:57:47 +0000 (18:57 +0100)

Trivial merge