Merge branch 'develop' into releases/Release_2_10_Branch
authorJim Procter <jprocter@issues.jalview.org>
Fri, 23 Sep 2016 10:29:08 +0000 (11:29 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Fri, 23 Sep 2016 10:29:08 +0000 (11:29 +0100)

Trivial merge