Merge branch 'releases/Release_2_10_0_Branch_fixmaster' into develop
authorJim Procter <jprocter@issues.jalview.org>
Tue, 25 Oct 2016 10:55:28 +0000 (11:55 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Tue, 25 Oct 2016 10:55:28 +0000 (11:55 +0100)

Trivial merge