Merge branch 'develop' into releases/Release_2_10_2_Branch
authorJim Procter <jprocter@issues.jalview.org>
Thu, 29 Jun 2017 09:38:45 +0000 (10:38 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Thu, 29 Jun 2017 09:38:45 +0000 (10:38 +0100)

Trivial merge