bugfix

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