Merge branch 'develop' into releases/Release_2_10_2_Branch
authorJim Procter <jprocter@issues.jalview.org>
Mon, 14 Aug 2017 16:25:16 +0000 (17:25 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Mon, 14 Aug 2017 16:25:16 +0000 (17:25 +0100)

Trivial merge