From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Thu, 18 Apr 2019 08:31:17 +0000 (+0100)
Subject: Merge branch 'develop' into Jalview-JS/develop
X-Git-Tag: Release_2_11_4_0~45^2~18^2~148
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=c351445b53d36b27c1b9d2a7e7fa13e9279d8645;p=jalview.git

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

c351445b53d36b27c1b9d2a7e7fa13e9279d8645