Merge branch 'feature/JAL-2745ebiHttps' into develop
authorJim Procter <jprocter@issues.jalview.org>
Fri, 29 Sep 2017 16:00:57 +0000 (17:00 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Fri, 29 Sep 2017 16:00:57 +0000 (17:00 +0100)

Trivial merge