Updated

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

Change-Id: I29c20b0dc2a26022682fe9c8f8deadf205ed5c78