Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
authorBen Soares <bsoares@dundee.ac.uk>
Tue, 11 Jun 2019 14:05:58 +0000 (15:05 +0100)
committerBen Soares <bsoares@dundee.ac.uk>
Tue, 11 Jun 2019 14:05:58 +0000 (15:05 +0100)

Trivial merge