From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Wed, 27 Mar 2019 17:07:24 +0000 (+0000)
Subject: Merge branch 'develop' into Jalview-JS/develop
X-Git-Tag: Release_2_11_4_0~45^2~18^2~202
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=22751aff02dc52ad529a85962a8ebc7733176d7e;p=jalview.git

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

22751aff02dc52ad529a85962a8ebc7733176d7e