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

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

92e714e08b915eaa77e8daad1c33b89021b0df1a