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

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

3ac458b483413a84f3a3fe477d4d5990dd0c3a4c