Merge branch 'develop' into releases/Release_2_10_Branch
authorJim Procter <jprocter@issues.jalview.org>
Thu, 20 Oct 2016 11:17:15 +0000 (12:17 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Thu, 20 Oct 2016 11:17:15 +0000 (12:17 +0100)

Trivial merge