Stuff.

Change-Id: I0712a586c53cdb4db75bd670a2963ef7e5599b0c
Merge branch 'alexandria' of ssh://gerrit.gromacs.org:29418/gromacs into alexandria