From: Jim Procter <jprocter@issues.jalview.org>
Date: Mon, 23 Oct 2017 16:17:09 +0000 (+0100)
Subject: Merge branch 'bug/JAL-2609attemptedmerge' into develop
X-Git-Tag: Release_2_10_3b1~90
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=5b7c6735d44fbd8d2c3fd36ede2ae7520fc16b7e;p=jalview.git

Merge branch 'bug/JAL-2609attemptedmerge' into develop
---

5b7c6735d44fbd8d2c3fd36ede2ae7520fc16b7e