Merge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' into Jalview-JS/20190123
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 24 Jan 2019 15:58:26 +0000 (15:58 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 24 Jan 2019 15:58:26 +0000 (15:58 +0000)

Trivial merge