Merge branch 'develop' into bug/JAL-3753_resources_duplicated_in_jalview_jar
authorBen Soares <b.soares@dundee.ac.uk>
Wed, 23 Sep 2020 16:19:01 +0000 (17:19 +0100)
committerBen Soares <b.soares@dundee.ac.uk>
Wed, 23 Sep 2020 16:19:01 +0000 (17:19 +0100)

Trivial merge