Merge branch 'develop' into releases/Release_2_10_Branch
authorJim Procter <jprocter@issues.jalview.org>
Wed, 19 Oct 2016 15:52:33 +0000 (16:52 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Wed, 19 Oct 2016 15:52:33 +0000 (16:52 +0100)

Trivial merge