Merge branch 'develop' into releases/Release_2_10_Branch
authorJim Procter <jprocter@issues.jalview.org>
Mon, 21 Nov 2016 15:39:39 +0000 (15:39 +0000)
committerJim Procter <jprocter@issues.jalview.org>
Mon, 21 Nov 2016 15:39:39 +0000 (15:39 +0000)

Trivial merge