Merge branch 'develop' into releases/Release_2_10_Branch
authorJim Procter <jprocter@issues.jalview.org>
Mon, 24 Oct 2016 14:24:45 +0000 (15:24 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Mon, 24 Oct 2016 14:24:45 +0000 (15:24 +0100)

Trivial merge