Merge branch 'merge/JAL-3091_JAL-3111_develop_211' into develop
authorJim Procter <jprocter@issues.jalview.org>
Tue, 11 Sep 2018 12:56:41 +0000 (13:56 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Tue, 11 Sep 2018 12:56:41 +0000 (13:56 +0100)

Trivial merge