Merge branch 'develop' into Jalview-BH/JAL-3026
authorJim Procter <jprocter@issues.jalview.org>
Tue, 26 Jun 2018 16:08:17 +0000 (17:08 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Tue, 26 Jun 2018 16:08:17 +0000 (17:08 +0100)

Trivial merge