From: Ben Soares <bsoares@dundee.ac.uk>
Date: Tue, 28 May 2019 11:14:51 +0000 (+0100)
Subject: Merge branch 'develop' into task/JAL-3141_JAL-3247_merge
X-Git-Tag: Release_2_11_1_0~53^2~8
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=f82780dec2f00704d0afb9ab091f11389ba2c4ed;p=jalview.git

Merge branch 'develop' into task/JAL-3141_JAL-3247_merge

updating merge
---

f82780dec2f00704d0afb9ab091f11389ba2c4ed