Merge branch 'merge/JAL-3091_JAL-3111_develop_211' into develop
authorJim Procter <jprocter@issues.jalview.org>
Wed, 12 Sep 2018 15:20:51 +0000 (16:20 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Wed, 12 Sep 2018 15:20:51 +0000 (16:20 +0100)

Trivial merge