Merge branch 'develop' into releases/Release_2_10_Branch
authorJim Procter <jprocter@issues.jalview.org>
Wed, 21 Sep 2016 10:13:01 +0000 (11:13 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Wed, 21 Sep 2016 10:13:01 +0000 (11:13 +0100)

Trivial merge