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

Trivial merge