Merge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of https://source.jalview.org/git...
authorhansonr <hansonr@STO24954W.ad.stolaf.edu>
Thu, 1 Nov 2018 17:06:13 +0000 (12:06 -0500)
committerhansonr <hansonr@STO24954W.ad.stolaf.edu>
Thu, 1 Nov 2018 17:06:13 +0000 (12:06 -0500)

Trivial merge