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

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

0df37dd0eaf85aac817e0a5f747819b49f405024