From: kiramt <k.mourao@dundee.ac.uk>
Date: Fri, 18 Aug 2017 08:19:58 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/develop' into bug/JAL-2665
X-Git-Tag: Release_2_10_3b1~140^2~5
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=6cb8a25a29bb9470915b67d0c9089b8043d368e4;p=jalview.git

Merge remote-tracking branch 'origin/develop' into bug/JAL-2665
---

6cb8a25a29bb9470915b67d0c9089b8043d368e4