From: kiramt <k.mourao@dundee.ac.uk>
Date: Tue, 26 Sep 2017 19:41:30 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/bug/JAL-2742' into feature/JAL-2674take2
X-Git-Tag: Release_2_10_4~55^2~1^2~101
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=148a69a79e432fc243e658544c345ae68ebff421;p=jalview.git

Merge remote-tracking branch 'origin/bug/JAL-2742' into feature/JAL-2674take2
---

148a69a79e432fc243e658544c345ae68ebff421