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

Trivial merge