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

Trivial merge