Merge branch 'develop' into releases/Release_2_10_Branch
authorJim Procter <jprocter@issues.jalview.org>
Wed, 5 Oct 2016 22:07:28 +0000 (23:07 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Wed, 5 Oct 2016 22:07:28 +0000 (23:07 +0100)

Trivial merge