From: soares <bsoares@dundee.ac.uk>
Date: Tue, 7 Apr 2020 16:55:50 +0000 (+0100)
Subject: merge from develop: Most of the changes
X-Git-Tag: Release_2_11_4_0~45^2~18^2~14
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=ce3d27d8c625c0f8a1a0d766fbf7941d92d88c94;p=jalview.git

merge from develop: Most of the changes
---

ce3d27d8c625c0f8a1a0d766fbf7941d92d88c94