Merge branch 'bug/JAL-2321_merged' into develop
authorJim Procter <jprocter@issues.jalview.org>
Wed, 2 Aug 2017 16:01:02 +0000 (17:01 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Wed, 2 Aug 2017 16:01:02 +0000 (17:01 +0100)

Trivial merge