Merge branch 'develop' into Jalview-JS/develop
authorsoares <bsoares@dundee.ac.uk>
Thu, 28 May 2020 16:24:09 +0000 (17:24 +0100)
committersoares <bsoares@dundee.ac.uk>
Thu, 28 May 2020 16:24:09 +0000 (17:24 +0100)

Trivial merge