From: Ben Soares <bsoares@dundee.ac.uk>
Date: Mon, 27 May 2019 14:50:52 +0000 (+0100)
Subject: Merge branch 'develop' into task/JAL-3247_JAL-3246_JAL-3254_JAL-3236_merge
X-Git-Tag: Release_2_11_1_0~53^2~11^2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=5e922f6c32e448df4e8455d87489d0464b1c41aa;p=jalview.git

Merge branch 'develop' into task/JAL-3247_JAL-3246_JAL-3254_JAL-3236_merge

Merging in develop
---

5e922f6c32e448df4e8455d87489d0464b1c41aa