From: Ben Soares <b.soares@dundee.ac.uk>
Date: Thu, 3 Sep 2020 15:27:44 +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~15
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=f8691b979a068d0992608a51de66271f299dbb6b;p=jalview.git

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

f8691b979a068d0992608a51de66271f299dbb6b