From: Ben Soares <bsoares@dundee.ac.uk>
Date: Tue, 18 Jun 2019 15:31:20 +0000 (+0100)
Subject: Merge branch 'develop' into merge/JAL-3310_and_JAL-3300
X-Git-Tag: Release_2_11_0~6^2^2~3
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=87cf0bc9b8dd3420b6e4118b61c2a6eeab6a6b22;p=jalview.git

Merge branch 'develop' into merge/JAL-3310_and_JAL-3300
---

87cf0bc9b8dd3420b6e4118b61c2a6eeab6a6b22