From: Ben Soares <b.soares@dundee.ac.uk>
Date: Mon, 14 Sep 2020 22:24:59 +0000 (+0100)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
X-Git-Tag: Develop-2_11_2_0-d20201215~24^2~7
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=02d251a913dfe940a7d3e86dce7f37fee06bd916;p=jalview.git

Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
---

02d251a913dfe940a7d3e86dce7f37fee06bd916