Merge branch 'develop' into releases/Release_2_10_2_Branch
authorJim Procter <jprocter@issues.jalview.org>
Tue, 15 Aug 2017 15:55:22 +0000 (16:55 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Tue, 15 Aug 2017 15:55:22 +0000 (16:55 +0100)

Trivial merge