From: kiramt <k.mourao@dundee.ac.uk>
Date: Thu, 19 Oct 2017 13:14:59 +0000 (+0100)
Subject: Merge branch 'develop' into bug/JAL-2609attemptedmerge
X-Git-Tag: Release_2_10_3b1~91^2~2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=02d91bab6246aa621844864b2351bbe1ed3905f6;p=jalview.git

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

02d91bab6246aa621844864b2351bbe1ed3905f6