From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Mon, 25 Mar 2019 16:37:39 +0000 (+0000)
Subject: Merge branch 'develop' into Jalview-JS/develop
X-Git-Tag: Release_2_11_4_0~45^2~18^2~212
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=5d4b4eb70fb510e1720259328bfc7ac201373c5e;p=jalview.git

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

5d4b4eb70fb510e1720259328bfc7ac201373c5e