From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Thu, 4 Jul 2019 12:09:21 +0000 (+0100)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
X-Git-Tag: Release_2_11_0~1^2~4
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=04891000c8b07e61b59f3b5ced0e42835dec73ce;p=jalview.git

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

04891000c8b07e61b59f3b5ced0e42835dec73ce