From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Mon, 15 Apr 2019 08:47:50 +0000 (+0100)
Subject: Merge branch 'develop' into Jalview-JS/develop
X-Git-Tag: Develop-2_11_2_0-d20201215~24^2~68^2~162
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=b3d9eaf8829a3aeb2bbc522315207a7940b0844e;p=jalview.git

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

b3d9eaf8829a3aeb2bbc522315207a7940b0844e