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

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

3e591f9bc92caedd17b9e6b368f6ef2185dc702c