Merge branch 'merge/JAL-3609_and_JAL-3608' into releases/Release_2_11_1_Branch
authorJim Procter <jprocter@issues.jalview.org>
Sat, 4 Jul 2020 14:11:45 +0000 (15:11 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Sat, 4 Jul 2020 14:11:45 +0000 (15:11 +0100)

Trivial merge