Merge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of https://source.jalview.org/git...
authorhansonr <hansonr@STO24954W.ad.stolaf.edu>
Tue, 29 Jan 2019 18:52:22 +0000 (12:52 -0600)
committerhansonr <hansonr@STO24954W.ad.stolaf.edu>
Tue, 29 Jan 2019 18:52:22 +0000 (12:52 -0600)

Trivial merge