Merge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of https://source.jalview.org/git...
authorhansonr <hansonr@STO24954W.ad.stolaf.edu>
Tue, 13 Nov 2018 20:32:41 +0000 (14:32 -0600)
committerhansonr <hansonr@STO24954W.ad.stolaf.edu>
Tue, 13 Nov 2018 20:32:41 +0000 (14:32 -0600)

Trivial merge