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

Trivial merge