From: Jim Procter <jprocter@issues.jalview.org>
Date: Fri, 18 Jan 2019 14:06:09 +0000 (+0000)
Subject: Merge branch 'develop' into feature/JAL-3063jaxbNoCastor
X-Git-Tag: Release_2_11_0~17^2~97^2~29^2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=228413670a113d52552ad1248e6baa20d12feb70;p=jalview.git

Merge branch 'develop' into feature/JAL-3063jaxbNoCastor
---

228413670a113d52552ad1248e6baa20d12feb70