From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Tue, 16 Jul 2019 10:27:05 +0000 (+0100)
Subject: Merge branch 'develop' into Jalview-JS/develop
X-Git-Tag: Release_2_11_4_0~45^2~18^2~124
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=7d26c9b146fca4d60af1a85366437d4aae54196a;p=jalview.git

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

7d26c9b146fca4d60af1a85366437d4aae54196a