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

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

aed2a422ff4e456f5f94052511891bf935db00cd