Merge branch 'develop' into releases/Release_2_10_Branch
authorJim Procter <jprocter@issues.jalview.org>
Wed, 23 Nov 2016 17:44:50 +0000 (17:44 +0000)
committerJim Procter <jprocter@issues.jalview.org>
Wed, 23 Nov 2016 17:44:50 +0000 (17:44 +0000)

Trivial merge