From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Thu, 6 Dec 2018 13:26:46 +0000 (+0000)
Subject: Merge branch 'develop' into Jalview-BH/JAL-3026-JAL-3063-JAXB
X-Git-Tag: Release_2_11_4_0~45^2~18^2~357
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=1fcc59559aec3e57268d4175f9ff3dbf9a3e16e5;p=jalview.git

Merge branch 'develop' into Jalview-BH/JAL-3026-JAL-3063-JAXB
---

1fcc59559aec3e57268d4175f9ff3dbf9a3e16e5