From: Ben Soares <b.soares@dundee.ac.uk>
Date: Tue, 1 Dec 2020 15:03:56 +0000 (+0000)
Subject: Merge branch 'develop' into merge/develop_and_rebase_squashed_merge_JAL-3628+JAL... 
X-Git-Tag: Develop-2_11_2_0-d20201215~15^2~2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=5b2e37416147e2dd563055e2d800b6b0533ca769;p=jalview.git

Merge branch 'develop' into merge/develop_and_rebase_squashed_merge_JAL-3628+JAL-3608+JAL-3609+JAL-3541+Release_2_11_1_Branch
---

5b2e37416147e2dd563055e2d800b6b0533ca769