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

Trivial merge