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

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

28c232b27469433dd85d3a09ecf8b6e2ff09eead