Merge branch 'develop' into releases/Release_2_10_4_Branch
authorJim Procter <jprocter@issues.jalview.org>
Thu, 15 Feb 2018 15:52:11 +0000 (15:52 +0000)
committerJim Procter <jprocter@issues.jalview.org>
Thu, 15 Feb 2018 15:52:11 +0000 (15:52 +0000)

Trivial merge