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

Trivial merge