Merge branch 'Jalview-BH/JAL-3026' into task/JAL-3033_jalviewjs_ant
authorJim Procter <jprocter@issues.jalview.org>
Tue, 26 Jun 2018 09:29:09 +0000 (10:29 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Tue, 26 Jun 2018 09:29:09 +0000 (10:29 +0100)

Trivial merge