From: Mark Abraham <mark.j.abraham@gmail.com>
Date: Tue, 20 Mar 2018 22:17:51 +0000 (+0100)
Subject: Merge branch release-2016 into release-2018
X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=commitdiff_plain;h=79a3c31ffbb70baed09021b9bc71d0494406a306;p=alexxy%2Fgromacs.git

Merge branch release-2016 into release-2018

Conflict in pre-submit matrix, kept 2018 content that already
has the same logical change made.

Change-Id: I40b2db8d149388bed07471fcdb8082b0fc92b9b5
---

79a3c31ffbb70baed09021b9bc71d0494406a306