From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Fri, 26 Apr 2019 13:55:07 +0000 (+0100)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
X-Git-Tag: Release_2_11_0~17^2^2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=a0fb5883fd17758900fa7e7fd40404626895e5ea;p=jalview.git

Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
---

a0fb5883fd17758900fa7e7fd40404626895e5ea