Merge branch 'develop' into feature/JAL-3063jaxbNoCastor
authorJim Procter <jprocter@issues.jalview.org>
Fri, 18 Jan 2019 14:06:09 +0000 (14:06 +0000)
committerJim Procter <jprocter@issues.jalview.org>
Fri, 18 Jan 2019 14:06:09 +0000 (14:06 +0000)

Trivial merge