From: Ben Soares <b.soares@dundee.ac.uk>
Date: Fri, 4 Nov 2022 17:58:36 +0000 (+0000)
Subject: Merge branch 'merge/JAL-4054+JAL-4064' into ben-big-merge
X-Git-Tag: Release_2_11_3_0~23^2~4^2~16
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=51c011768a77932d6c0aebd2d686a04fabaa2589;p=jalview.git

Merge branch 'merge/JAL-4054+JAL-4064' into ben-big-merge
---

51c011768a77932d6c0aebd2d686a04fabaa2589