Merge branch 'releases/Release_2_10_4_Branch'
authorJim Procter <jprocter@issues.jalview.org>
Wed, 9 May 2018 20:20:00 +0000 (21:20 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Wed, 9 May 2018 20:20:00 +0000 (21:20 +0100)

Trivial merge