From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Fri, 29 Mar 2019 10:31:02 +0000 (+0000)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
X-Git-Tag: Release_2_11_0~17^2~23
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=bcf549d4fb4c4b6fc31a7b9e70b324578df3c666;p=jalview.git

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

bcf549d4fb4c4b6fc31a7b9e70b324578df3c666