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

Trivial merge