Merge branch 'develop' into releases/Release_2_10_Branch
authorJim Procter <jprocter@issues.jalview.org>
Thu, 24 Nov 2016 10:10:19 +0000 (10:10 +0000)
committerJim Procter <jprocter@issues.jalview.org>
Thu, 24 Nov 2016 10:10:19 +0000 (10:10 +0000)

Trivial merge