From: Ben Soares <b.soares@dundee.ac.uk>
Date: Wed, 12 Aug 2020 11:00:57 +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~16
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=7c269dc87e6fda52db3d73d07bc5f3e879e1f681;hp=-c;p=jalview.git

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

7c269dc87e6fda52db3d73d07bc5f3e879e1f681