From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Tue, 28 Nov 2017 10:25:22 +0000 (+0000)
Subject: Merge branch 'develop' into features/JAL-1793VCF
X-Git-Tag: Release_2_11_0~98
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=ffdb4b96dd9696ec6de51fba883fbc6696314ffd;p=jalview.git

Merge branch 'develop' into features/JAL-1793VCF
---

ffdb4b96dd9696ec6de51fba883fbc6696314ffd