From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Wed, 12 Sep 2018 11:27:21 +0000 (+0100)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
X-Git-Tag: Release_2_11_1_0~108
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=5b9fcd4e9349485a0be84260b3199c746adfbe92;p=jalview.git

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

5b9fcd4e9349485a0be84260b3199c746adfbe92