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

Trivial merge