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

Trivial merge