From: Jim Procter <jprocter@issues.jalview.org>
Date: Tue, 1 Aug 2017 15:43:09 +0000 (+0100)
Subject: Merge branch 'develop' into releases/Release_2_10_2_Branch
X-Git-Tag: Release_2_10_2~3^2~18
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=2f3a8b43b66264ee2e90a5ae82e6be290777bee2;p=jalview.git

Merge branch 'develop' into releases/Release_2_10_2_Branch
---

2f3a8b43b66264ee2e90a5ae82e6be290777bee2