From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Thu, 18 Apr 2019 08:36:57 +0000 (+0100)
Subject: Merge branch 'develop' into Jalview-JS/develop
X-Git-Tag: Develop-2_11_2_0-d20201215~24^2~68^2~147
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=806fc72ee9b84300a763a89c5d8fd2c0f80da610;hp=-c;p=jalview.git

Merge branch 'develop' into Jalview-JS/develop
---

806fc72ee9b84300a763a89c5d8fd2c0f80da610