From: kiramt <k.mourao@dundee.ac.uk>
Date: Thu, 10 Aug 2017 13:54:37 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/develop' into feature/JAL-2587
X-Git-Tag: Release_2_10_2b1~4^2^2~6
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=5a9eb84110b75bca3de6489501c17a499de98054;p=jalview.git

Merge remote-tracking branch 'origin/develop' into feature/JAL-2587
---

5a9eb84110b75bca3de6489501c17a499de98054