From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Thu, 28 Mar 2019 16:13:39 +0000 (+0000)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
X-Git-Tag: Release_2_11_0~17^2~25
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=26a427cb2f1a86faf7115a411b1e87ffaf9d4444;p=jalview.git

Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
---

26a427cb2f1a86faf7115a411b1e87ffaf9d4444