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

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

790ae3a67afce3779c0a064efb7814df2dffb7c0