Merge branch 'develop' into releases/Release_2_10_Branch
authorJim Procter <jprocter@issues.jalview.org>
Fri, 30 Sep 2016 13:17:53 +0000 (14:17 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Fri, 30 Sep 2016 13:17:53 +0000 (14:17 +0100)

Trivial merge